diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index ec4c405feee..abdd09383bb 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -341,12 +341,6 @@ execute:frappe.defaults.clear_default("fiscal_year")
 execute:frappe.db.set_single_value('Selling Settings', 'allow_negative_rates_for_items', 0)
 erpnext.patches.v14_0.correct_asset_value_if_je_with_workflow
 erpnext.patches.v14_0.migrate_deferred_accounts_to_item_defaults
-<<<<<<< HEAD
-=======
-erpnext.patches.v14_0.update_invoicing_period_in_subscription
-execute:frappe.delete_doc("Page", "welcome-to-erpnext")
-erpnext.patches.v15_0.delete_payment_gateway_doctypes
 erpnext.patches.v14_0.create_accounting_dimensions_in_sales_order_item
->>>>>>> e31db18912 (chore: Add accounting dimensions to Sales Order Item table)
 # below migration patch should always run last
 erpnext.patches.v14_0.migrate_gl_to_payment_ledger