diff --git a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
index cef88965f6b..f9344ce4f3a 100644
--- a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
+++ b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
@@ -53,11 +53,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-09-26 14:21:27.362567",
-=======
  "modified": "2024-05-23 17:00:42.984798",
->>>>>>> e2ec3e453a (refactor: remove 'format:' based naming in internal doctypes)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Repost Accounting Ledger",
diff --git a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json
index 84205990dda..4ecff8cac3b 100644
--- a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json
+++ b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json
@@ -98,11 +98,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-09-26 14:21:35.719727",
-=======
  "modified": "2024-05-23 17:00:31.540640",
->>>>>>> e2ec3e453a (refactor: remove 'format:' based naming in internal doctypes)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Repost Payment Ledger",