diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 01dc68d1d3a..1f1c2edc917 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -379,10 +379,6 @@ erpnext.patches.v15_0.drop_index_posting_datetime_from_sle
 erpnext.patches.v15_0.add_disassembly_order_stock_entry_type #1
 erpnext.patches.v15_0.set_standard_stock_entry_type
 erpnext.patches.v15_0.link_purchase_item_to_asset_doc
-<<<<<<< HEAD
 erpnext.patches.v14_0.update_currency_exchange_settings_for_frankfurter
 erpnext.patches.v15_0.update_task_assignee_email_field_in_asset_maintenance_log
-=======
-erpnext.patches.v15_0.migrate_to_utm_analytics
 erpnext.patches.v15_0.update_sub_voucher_type_in_gl_entries
->>>>>>> d76cc21086 (fix: patch)