diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
index b5d7eb1d4b7..599a0604755 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
@@ -238,11 +238,7 @@
  "grid_page_length": 50,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2025-10-14 11:53:45.908169",
-=======
  "modified": "2025-10-23 17:32:58.514807",
->>>>>>> a2a41a0eaa (fix(Bank Transaction): make transaction ID non-unique)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Transaction",