diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 455f656ef3e..1fc10adf80b 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -483,11 +483,5 @@ erpnext.patches.v16_0.fix_titles
 erpnext.patches.v16_0.set_not_applicable_on_german_item_tax_templates
 erpnext.patches.v16_0.clear_procedures_from_receivable_report
 erpnext.patches.v16_0.migrate_address_contact_custom_fields
-<<<<<<< HEAD
-=======
-erpnext.patches.v16_0.rename_secondary_item_type_field
-erpnext.patches.v16_0.submit_existing_product_bundles #1
-erpnext.patches.v16_0.migrate_subscription_generate_invoice_at
 erpnext.patches.v16_0.rename_subscription_billing_period_fields
 erpnext.patches.v16_0.drop_redundant_serial_no_index_from_sabb
->>>>>>> b1b6ae98ed (perf: composite index on (serial_no, warehouse, posting_datetime))