diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 8ca7bcf5c7e..75373398b09 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -625,11 +625,7 @@
  "icon": "fa fa-info-sign",
  "idx": 195,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-10-13 12:42:21.545636",
-=======
  "modified": "2024-08-20 04:12:29.095761",
->>>>>>> 74afa57a9f (fix: do not copy date fields in opportunity doctype)
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Opportunity",