diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.json b/crm/fcrm/doctype/crm_deal/crm_deal.json
index d1bf1476..14880fbd 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.json
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.json
@@ -428,19 +428,7 @@
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- "modified": "2025-07-05 12:25:05.927806",
-=======
- "modified": "2025-07-06 15:16:37.673699",
->>>>>>> 6450b69a (fix: capture closed on datetime when deal marked as Won)
-=======
- "modified": "2025-07-09 14:26:53.986118",
->>>>>>> 0be73791 (fix: store currency exchange in deal & organization)
-=======
  "modified": "2025-07-09 17:58:55.956639",
->>>>>>> d7ba5a5f (fix: store current day exchange rate when currency is updated in deal & organization)
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal",