diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index c7f72ec90e2..6aaf9aa33aa 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -350,15 +350,4 @@ erpnext.patches.v13_0.enable_provisional_accounting
 erpnext.patches.v13_0.update_disbursement_account
 erpnext.patches.v13_0.update_reserved_qty_closed_wo
 erpnext.patches.v13_0.amazon_mws_deprecation_warning
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-erpnext.patches.v13_0.amazon_mws_deprecation_warning
-=======
-erpnext.patches.v14_0.delete_amazon_mws_doctype
-erpnext.patches.v14_0.set_work_order_qty_in_so_from_mr
->>>>>>> 0ca58d7627 (chore: Patch to update SO work_order_qty and Linter fix)
->>>>>>> 98ce6a1c8d (chore: Patch to update SO work_order_qty and Linter fix)
-=======
 erpnext.patches.v13_0.set_work_order_qty_in_so_from_mr
->>>>>>> 94a1016623 (chore: Move patch that updates SO from WO to v13)