diff --git a/erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.py b/erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.py
index 7260884d60c..ebce209fbc2 100644
--- a/erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.py
+++ b/erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.py
@@ -6,27 +6,4 @@ from frappe.model.document import Document
 
 
 class BlanketOrderItem(Document):
-<<<<<<< HEAD
-=======
-	# begin: auto-generated types
-	# This code is auto-generated. Do not modify anything in this block.
-
-	from typing import TYPE_CHECKING
-
-	if TYPE_CHECKING:
-		from frappe.types import DF
-
-		item_code: DF.Link
-		item_name: DF.Data | None
-		ordered_qty: DF.Float
-		parent: DF.Data
-		parentfield: DF.Data
-		parenttype: DF.Data
-		party_item_code: DF.Data | None
-		qty: DF.Float
-		rate: DF.Currency
-		terms_and_conditions: DF.Text | None
-	# end: auto-generated types
-
->>>>>>> 1a8f7f9403 (fix: party item code in Blanket Order)
 	pass