diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.js b/erpnext/manufacturing/doctype/production_plan/production_plan.js
index 90d85a0cf91..4b11d4f9119 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.js
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.js
@@ -16,12 +16,9 @@ frappe.ui.form.on("Production Plan", {
 			"Work Order": "Work Order / Subcontract PO",
 			"Material Request": "Material Request",
 		};
-<<<<<<< HEAD
-=======
 
 		frm.set_df_property("sub_assembly_items", "cannot_add_rows", true);
 		frm.set_df_property("mr_items", "cannot_add_rows", true);
->>>>>>> 25f979a825 (fix: prevent rows from being added to sub_assembly_items and mr_items)
 	},
 
 	setup_queries(frm) {