diff --git a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
index 8ba79581d50..f2c2f380fe9 100644
--- a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
+++ b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
@@ -56,11 +56,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-08-28 17:42:50.261377",
-=======
  "modified": "2024-10-10 12:03:50.022444",
->>>>>>> e8e1ec0e85 (refactor: remove 'format:' based naming)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Unreconcile Payment",