diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 7af2e39eb98..7ded266c62a 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -428,9 +428,4 @@ execute:frappe.db.set_single_value("Accounts Settings", "show_party_balance", 1)
 execute:frappe.db.set_single_value("Accounts Settings", "show_account_balance", 1)
 erpnext.patches.v16_0.update_currency_exchange_settings_for_frankfurter #2025-12-11
 erpnext.patches.v15_0.create_accounting_dimensions_in_advance_taxes_and_charges
-<<<<<<< HEAD
-=======
-execute:frappe.delete_doc_if_exists("Workspace Sidebar", "Opening & Closing")
-erpnext.patches.v16_0.migrate_transaction_deletion_task_flags_to_status # 2
 erpnext.patches.v16_0.set_ordered_qty_in_quotation_item
->>>>>>> 4cc306d2d8 (fix: validate over ordering of quotation)