diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index 4808c37ef02..d6ba193aa0e 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -778,11 +778,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
-<<<<<<< HEAD
- "modified": "2024-01-03 12:46:41.759121",
-=======
  "modified": "2024-04-11 11:25:07.366347",
->>>>>>> c3845ac0f1 (fix: Allow updating cost center and project for repostable doctypes)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry",
@@ -828,4 +824,4 @@
  "states": [],
  "title_field": "title",
  "track_changes": 1
-}
\ No newline at end of file
+}