diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index 2125fbe5832..be692db5665 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -469,11 +469,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-01-30 14:04:26.553554",
-=======
  "modified": "2024-05-11 23:19:44.673975",
->>>>>>> d56f52b0ba (feat: Config to enable immutable ledger)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",