diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index bc5236d15fb..1f6363d56cb 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -268,18 +268,12 @@ 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
-<<<<<<< HEAD
-=======
-erpnext.patches.v15_0.delete_taxjar_doctypes
-erpnext.patches.v15_0.delete_ecommerce_doctypes
->>>>>>> e1dedc5402 (fix: Show the rows in AR/AP report where outstanding equals to 0.01)
 erpnext.patches.v14_0.update_reference_due_date_in_journal_entry
 erpnext.patches.v14_0.france_depreciation_warning
 erpnext.patches.v14_0.clear_reconciliation_values_from_singles
 erpnext.patches.v14_0.update_proprietorship_to_individual
 
 [post_model_sync]
-erpnext.patches.v15_0.create_asset_depreciation_schedules_from_assets
 execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings')
 erpnext.patches.v14_0.update_posting_datetime_and_dropped_indexes #22-02-2024
 erpnext.patches.v14_0.rename_ongoing_status_in_sla_documents