diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 4c15dc0c5e1..188ef944582 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -465,9 +465,6 @@ erpnext.patches.v16_0.set_ordered_qty_in_quotation_item
 erpnext.patches.v16_0.migrate_transaction_deletion_task_flags_to_status # 2
 erpnext.patches.v16_0.update_company_custom_field_in_bin
 erpnext.patches.v15_0.replace_http_with_https_in_sales_partner
-<<<<<<< HEAD
 erpnext.patches.v15_0.delete_quotation_lost_record_detail
 erpnext.patches.v16_0.add_portal_redirects
-=======
 erpnext.patches.v16_0.migrate_asset_type_checkboxes_to_select
->>>>>>> c36fa5bdb6 (fix: patch to migrate checkbox data into select)