diff --git a/erpnext/crm/doctype/competitor/competitor.json b/erpnext/crm/doctype/competitor/competitor.json
index 2348394d30e..021488ab99b 100644
--- a/erpnext/crm/doctype/competitor/competitor.json
+++ b/erpnext/crm/doctype/competitor/competitor.json
@@ -38,11 +38,7 @@
    "table_fieldname": "competitors"
   }
  ],
-<<<<<<< HEAD
- "modified": "2023-11-23 19:33:54.284279",
-=======
  "modified": "2024-12-10 08:26:38.496003",
->>>>>>> 4d5241486f (fix: permissions for marking Quotation as lost)
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Competitor",
diff --git a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
index e1eafb527e3..a0e0f176ddf 100644
--- a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
+++ b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
@@ -32,11 +32,7 @@
    "table_fieldname": "lost_reasons"
   }
  ],
-<<<<<<< HEAD
- "modified": "2023-11-23 19:31:02.743353",
-=======
  "modified": "2024-12-10 08:21:38.280627",
->>>>>>> 4d5241486f (fix: permissions for marking Quotation as lost)
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Quotation Lost Reason",