diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 3e6e6e008be..f4b1a06aea8 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -315,11 +315,7 @@ 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.v13_0.update_schedule_type_in_loans
 erpnext.patches.v13_0.drop_unused_sle_index_parts
->>>>>>> 8a56df695d (perf: Drop `name` part from posting sort index (#33551))
 erpnext.patches.v14_0.create_accounting_dimensions_for_asset_capitalization
 erpnext.patches.v13_0.update_schedule_type_in_loans
 erpnext.patches.v14_0.update_partial_tds_fields