diff --git a/erpnext/accounts/doctype/payment_schedule/payment_schedule.json b/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
index 0e1e7a84a4c..b72281b6314 100644
--- a/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
+++ b/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
@@ -177,23 +177,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-09-16 13:57:06.382859",
-=======
  "modified": "2025-03-11 11:06:51.792982",
->>>>>>> 6c2f9a563e (fix: add base_outstanding and base_paid_amount in payment schedule table)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Schedule",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
-<<<<<<< HEAD
- "sort_field": "modified",
-=======
  "row_format": "Dynamic",
  "sort_field": "creation",
->>>>>>> 6c2f9a563e (fix: add base_outstanding and base_paid_amount in payment schedule table)
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1