diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 6161957523f..d5a7ff156d3 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -449,9 +449,5 @@ erpnext.patches.v16_0.backfill_repost_accounting_ledger_status
 erpnext.patches.v16_0.merge_seeded_item_group_root
 erpnext.patches.v16_0.repair_work_order_material_transfer
 erpnext.patches.v16_0.remove_frappe_crm_custom_fields
-<<<<<<< HEAD
 erpnext.patches.v16_0.append_fieldname_to_pos_search_fields
-=======
-erpnext.patches.v16_0.add_batch_split_stock_entry_type
-erpnext.patches.v16_0.add_transaction_roles_to_sms_settings
->>>>>>> 3501beb (fix(sms_settings): add patch to pre-fill roles into SMS Settings Roles Table)
+erpnext.patches.v16_0.add_transaction_roles_to_sms_settings
\ No newline at end of file