diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 58d1bc00a0b..cbc224f99e4 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -344,28 +344,6 @@ erpnext.patches.v13_0.agriculture_deprecation_warning
 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
-<<<<<<< HEAD
-=======
-erpnext.patches.v13_0.enable_provisional_accounting
-erpnext.patches.v13_0.non_profit_deprecation_warning
-erpnext.patches.v13_0.enable_ksa_vat_docs #1
-erpnext.patches.v13_0.show_india_localisation_deprecation_warning
-erpnext.patches.v13_0.show_hr_payroll_deprecation_warning
-erpnext.patches.v13_0.reset_corrupt_defaults
-erpnext.patches.v13_0.create_accounting_dimensions_for_asset_repair
-
-[post_model_sync]
-execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings')
-erpnext.patches.v14_0.rename_ongoing_status_in_sla_documents
-erpnext.patches.v14_0.delete_shopify_doctypes
-erpnext.patches.v14_0.delete_healthcare_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 # 15-06-2022
-erpnext.patches.v14_0.delete_education_doctypes
-erpnext.patches.v14_0.delete_datev_doctypes
-erpnext.patches.v14_0.rearrange_company_fields
->>>>>>> 80f508c4b1 (chore: patch for creating existing dimensions in asset repair)
 erpnext.patches.v13_0.update_sane_transfer_against
 erpnext.patches.v13_0.enable_provisional_accounting
 erpnext.patches.v13_0.update_disbursement_account
@@ -394,3 +372,4 @@ erpnext.patches.v13_0.show_india_localisation_deprecation_warning
 erpnext.patches.v13_0.fix_number_and_frequency_for_monthly_depreciation
 erpnext.patches.v13_0.reset_corrupt_defaults
 erpnext.patches.v13_0.show_hr_payroll_deprecation_warning
+erpnext.patches.v13_0.create_accounting_dimensions_for_asset_repair