diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
index a2eec24023b..3210457c645 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
@@ -211,19 +211,7 @@
  ],
  "hide_toolbar": 1,
  "links": [],
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- "modified": "2022-09-07 11:11:40.293317",
-=======
- "modified": "2024-06-25 15:34:35.214946",
->>>>>>> 13fb560401 (fix: custom delimiters)
-=======
- "modified": "2024-06-25 16:33:50.675848",
->>>>>>> b202409428 (fix: remove deprecated field "statement_import_log")
-=======
  "modified": "2024-06-25 17:32:07.658250",
->>>>>>> 98ad01c736 (fix: field position)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Statement Import",