diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index b39f5658efd..5ed8f3f4a91 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -315,8 +315,6 @@ erpnext.patches.v14_0.fix_crm_no_of_employees
 erpnext.patches.v14_0.create_accounting_dimensions_in_subcontracting_doctypes
 erpnext.patches.v14_0.fix_subcontracting_receipt_gl_entries
 erpnext.patches.v14_0.migrate_remarks_from_gl_to_payment_ledger
-<<<<<<< HEAD
 erpnext.patches.v14_0.create_accounting_dimensions_for_asset_capitalization
-=======
 erpnext.patches.v13_0.update_schedule_type_in_loans
->>>>>>> 679b5ed551 (chore: Add patch to update repayment schedule type in loan documents)
+