diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 13df4f5d34b..5436cd3e54f 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -2128,13 +2128,9 @@ def check_item_quality_inspection(doctype, items):
 
 
 @frappe.whitelist()
-<<<<<<< HEAD
-def make_quality_inspections(doctype, docname, items, inspection_type):
-=======
 def make_quality_inspections(
 	company: str, doctype: str, docname: str, items: str | list, inspection_type: str
 ):
->>>>>>> 74def423ed (fix(stock): pass company to avoid document naming rule issue in QI)
 	if isinstance(items, str):
 		items = json.loads(items)