diff --git a/erpnext/crm/doctype/prospect/prospect.json b/erpnext/crm/doctype/prospect/prospect.json
index d9fce557a15..5ff8284e66c 100644
--- a/erpnext/crm/doctype/prospect/prospect.json
+++ b/erpnext/crm/doctype/prospect/prospect.json
@@ -220,11 +220,7 @@
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-10-13 12:29:33.674561",
-=======
  "modified": "2025-03-06 11:31:49.083983",
->>>>>>> 884709deb8 (fix: Allow rename prospect doctype (#46352))
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Prospect",
@@ -264,14 +260,10 @@
    "share": 1
   }
  ],
-<<<<<<< HEAD
  "sort_field": "modified",
-=======
- "row_format": "Dynamic",
  "sort_field": "creation",
->>>>>>> 884709deb8 (fix: Allow rename prospect doctype (#46352))
  "sort_order": "DESC",
  "states": [],
  "title_field": "company_name",
  "track_changes": 1
-}
\ No newline at end of file
+}