diff --git a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
index 5cb780b3e6f..4d0579ebc7e 100644
--- a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
+++ b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
@@ -125,11 +125,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-06-23 21:13:18.013816",
-=======
  "modified": "2024-12-20 12:04:46.729972",
->>>>>>> 225e56cbca (feat: add difference_posting_date field)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice Advance",
diff --git a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
index 151d493ed09..1246d04d3d6 100644
--- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
+++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
@@ -126,11 +126,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-06-23 21:12:57.557731",
-=======
  "modified": "2024-12-20 11:58:28.962370",
->>>>>>> 225e56cbca (feat: add difference_posting_date field)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Advance",