diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 6ddae058e55..bb76f948f3a 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -378,7 +378,6 @@ erpnext.patches.v14_0.update_reports_with_range
 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
-<<<<<<< HEAD
 erpnext.patches.v15_0.link_purchase_item_to_asset_doc
 erpnext.patches.v14_0.update_currency_exchange_settings_for_frankfurter
 erpnext.patches.v15_0.update_task_assignee_email_field_in_asset_maintenance_log
@@ -393,6 +392,4 @@ erpnext.patches.v15_0.migrate_checkbox_to_select_for_reconciliation_effect
 erpnext.patches.v15_0.sync_auto_reconcile_config
 execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_posting_date", "Payment")
 erpnext.patches.v14_0.disable_add_row_in_gross_profit
-=======
 erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment
->>>>>>> d4fdada83c (feat: account heads changed along with journal entry type and descrip… (#42845))