diff --git a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
index 76d52f12bcd..b5f6a3ab065 100644
--- a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
+++ b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -205,28 +205,6 @@
    "fieldtype": "Float",
    "label": "Produced Qty",
    "read_only": 1
-<<<<<<< HEAD
-=======
-  },
-  {
-   "columns": 2,
-   "fieldname": "required_qty",
-   "fieldtype": "Float",
-   "in_list_view": 1,
-   "label": "Required Qty"
-  },
-  {
-   "fieldname": "subcontracting_section",
-   "fieldtype": "Section Break",
-   "label": "Subcontracting"
-  },
-  {
-   "fieldname": "stock_reserved_qty",
-   "fieldtype": "Float",
-   "label": "Stock Reserved Qty",
-   "no_copy": 1,
-   "print_hide": 1,
-   "read_only": 1
   },
   {
    "fieldname": "ordered_qty",
@@ -234,17 +212,12 @@
    "label": "Ordered Qty",
    "no_copy": 1,
    "read_only": 1
->>>>>>> 384f4e120a (fix: do not create repeat work orders)
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-02-27 13:45:17.422435",
-=======
  "modified": "2025-06-10 13:36:24.759101",
->>>>>>> 384f4e120a (fix: do not create repeat work orders)
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Production Plan Sub Assembly Item",
@@ -255,4 +228,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}