diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index d90b4eda72a..3c59e1ff550 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -467,7 +467,4 @@ erpnext.patches.v16_0.update_company_custom_field_in_bin
 erpnext.patches.v15_0.replace_http_with_https_in_sales_partner
 erpnext.patches.v15_0.delete_quotation_lost_record_detail
 erpnext.patches.v16_0.add_portal_redirects
-<<<<<<< HEAD
-=======
 erpnext.patches.v16_0.complete_onboarding_steps_for_older_sites #2
->>>>>>> d90ec49241 (fix: patch to complete onboarding stpes for existing records)