diff --git a/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json b/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
index 487879da97d..444a45ff8c1 100644
--- a/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
+++ b/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -100,11 +100,7 @@
  "in_create": 1,
  "index_web_pages_for_search": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2025-10-13 15:11:58.300836",
-=======
  "modified": "2025-11-13 12:45:03.014555",
->>>>>>> 287cb621cd (feat: add exchange rate & base field in advance payment ledger, set exchange rate in journal entry on every refresh)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Advance Payment Ledger Entry",