diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 1e476d14892..f2868b90d5c 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -363,8 +363,4 @@ erpnext.patches.v14_0.set_maintain_stock_for_bom_item
 erpnext.patches.v15_0.delete_orphaned_asset_movement_item_records
 erpnext.patches.v15_0.fix_debit_credit_in_transaction_currency
 erpnext.patches.v15_0.remove_cancelled_asset_capitalization_from_asset
-<<<<<<< HEAD
-=======
-erpnext.patches.v15_0.fix_debit_credit_in_transaction_currency
 erpnext.patches.v15_0.rename_purchase_receipt_amount_to_purchase_amount
->>>>>>> 31841b4ab2 (refactor: renamed purchase receipt amount field to purchase amount)