diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index 0797f53278f..570ae6637ee 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -201,9 +201,6 @@
    "description": "In the case of 'Use Multi-Level BOM' in a work order, if the user wishes to add sub-assembly costs to Finished Goods items without using a job card as well the scrap items, then this option needs to be enable.",
    "fieldname": "set_op_cost_and_scrape_from_sub_assemblies",
    "fieldtype": "Check",
-<<<<<<< HEAD
-   "label": "Set Operating Cost / Scrape Items From Sub-assemblies"
-=======
    "label": "Set Operating Cost / Scrap Items From Sub-assemblies"
   },
   {
@@ -240,18 +237,13 @@
    "fieldname": "validate_components_quantities_per_bom",
    "fieldtype": "Check",
    "label": "Validate Components and Quantities Per BOM"
->>>>>>> a9b761f862 (fix: typo in manufacturing settings)
   }
  ],
  "icon": "icon-wrench",
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-12-28 16:37:44.874096",
-=======
  "modified": "2025-01-09 16:02:23.326763",
->>>>>>> a9b761f862 (fix: typo in manufacturing settings)
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Manufacturing Settings",
@@ -269,4 +261,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}