diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index fae3c93e722..7e03ef9394c 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -383,10 +383,6 @@ 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.update_sub_voucher_type_in_gl_entries
 erpnext.patches.v14_0.update_stock_uom_in_work_order_item
-<<<<<<< HEAD
 erpnext.patches.v15_0.set_is_exchange_gain_loss_in_payment_entry_deductions
 erpnext.patches.v15_0.enable_allow_existing_serial_no
-=======
-erpnext.patches.v15_0.enable_allow_existing_serial_no
 erpnext.patches.v15_0.update_cc_in_process_statement_of_accounts
->>>>>>> 2a6be127ef (fix: update cc_to multiselect in process statement of accounts)