diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index acb4306cbb0..447e264ad75 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -411,10 +411,5 @@ erpnext.patches.v14_0.update_full_name_in_contract
 erpnext.patches.v15_0.drop_sle_indexes
 erpnext.patches.v15_0.update_pick_list_fields
 erpnext.patches.v15_0.update_pegged_currencies
-<<<<<<< HEAD
-erpnext.patches.v15_0.set_company_on_pos_inv_merge_log
-=======
-erpnext.patches.v15_0.set_status_cancelled_on_cancelled_pos_opening_entry_and_pos_closing_entry
 erpnext.patches.v15_0.set_company_on_pos_inv_merge_log
 erpnext.patches.v15_0.rename_price_list_to_buying_price_list
->>>>>>> adb9a6bc15 (fix: field name of price_list in material request)