diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 3d76df32202..696544f8832 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -346,28 +346,5 @@ erpnext.patches.v13_0.update_maintenance_schedule_field_in_visit
 erpnext.patches.v13_0.hospitality_deprecation_warning
 erpnext.patches.v13_0.delete_bank_reconciliation_detail
 erpnext.patches.v13_0.update_sane_transfer_against
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-erpnext.patches.v13_0.update_sane_transfer_against
-=======
 erpnext.patches.v13_0.enable_provisional_accounting
 
-[post_model_sync]
-erpnext.patches.v14_0.rename_ongoing_status_in_sla_documents
-erpnext.patches.v14_0.add_default_exit_questionnaire_notification_template
-erpnext.patches.v14_0.delete_shopify_doctypes
-erpnext.patches.v14_0.delete_hub_doctypes
-erpnext.patches.v14_0.delete_hospitality_doctypes # 20-01-2022
-erpnext.patches.v14_0.delete_agriculture_doctypes
-erpnext.patches.v14_0.rearrange_company_fields
-erpnext.patches.v14_0.update_leave_notification_template
-erpnext.patches.v14_0.restore_einvoice_fields
-erpnext.patches.v13_0.update_sane_transfer_against
-erpnext.patches.v12_0.add_company_link_to_einvoice_settings
-erpnext.patches.v14_0.migrate_cost_center_allocations
->>>>>>> 528c71382f (feat: Provisional accounting for expenses (#29451))
->>>>>>> a54c84728f (feat: Provisional accounting for expenses (#29451))
-=======
-erpnext.patches.v13_0.enable_provisional_accounting
->>>>>>> aa16a4bb5f (chore: Resolve conflicts)