diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index bc393452483..d9ca43bab60 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -1680,11 +1680,7 @@ def repost_required_for_queue(doc: StockController) -> bool:
 
 
 @frappe.whitelist()
-<<<<<<< HEAD
-def check_item_quality_inspection(doctype, items):
-=======
 def check_item_quality_inspection(doctype: str, docstatus: str | int, items: str | list[dict]):
->>>>>>> c6a88ab1d2 (fix(stock): allow to create quality inspection after purchase/delivery)
 	if isinstance(items, str):
 		items = json.loads(items)