diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 575b3a041a8e..4cc383912764 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -400,13 +400,6 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends (
 									);
 								}
 							} else {
-<<<<<<< HEAD
-								cur_frm.add_custom_button(
-									__("Subcontracting Order"),
-									this.make_subcontracting_order,
-									__("Create")
-								);
-=======
 								if (!doc.items.every((item) => item.qty == item.sco_qty)) {
 									this.frm.add_custom_button(
 										__("Subcontracting Order"),
@@ -416,7 +409,6 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends (
 										__("Create")
 									);
 								}
->>>>>>> 3eba6bf3dd (feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711))
 							}
 						}
 					}
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index ebe6e1b587d7..94f2d0b5ce8f 100644
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -910,8 +910,6 @@
   {
    "fieldname": "column_break_fyqr",
    "fieldtype": "Column Break"
-<<<<<<< HEAD
-=======
   },
   {
    "fieldname": "column_break_pjyo",
@@ -937,18 +935,13 @@
    "label": "Subcontracted Quantity",
    "no_copy": 1,
    "read_only": 1
->>>>>>> 3eba6bf3dd (feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711))
   }
  ],
  "idx": 1,
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-02-05 11:23:24.859435",
-=======
  "modified": "2024-12-10 12:11:18.536089",
->>>>>>> 3eba6bf3dd (feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711))
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order Item",
diff --git a/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json b/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
index 7a3f5a8849f3..4b2f17885260 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
@@ -382,8 +382,6 @@
    "no_copy": 1,
    "read_only": 1,
    "search_index": 1
-<<<<<<< HEAD
-=======
   },
   {
    "fieldname": "references_section",
@@ -407,7 +405,6 @@
    "hidden": 1,
    "label": "SC Conversion Factor",
    "read_only": 1
->>>>>>> 3eba6bf3dd (feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711))
   }
  ],
  "idx": 1,
diff --git a/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json b/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
index 236133081499..ad3dfe34c888 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
@@ -155,11 +155,7 @@
  ],
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-11-30 13:29:31.017440",
-=======
  "modified": "2024-12-05 17:33:46.099601",
->>>>>>> 3eba6bf3dd (feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711))
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting Order Service Item",