diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 013031cf913..6aaf9aa33aa 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -349,9 +349,5 @@ erpnext.patches.v13_0.update_sane_transfer_against
 erpnext.patches.v13_0.enable_provisional_accounting
 erpnext.patches.v13_0.update_disbursement_account
 erpnext.patches.v13_0.update_reserved_qty_closed_wo
-<<<<<<< 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)
+erpnext.patches.v13_0.set_work_order_qty_in_so_from_mr
diff --git a/erpnext/patches/v14_0/set_work_order_qty_in_so_from_mr.py b/erpnext/patches/v13_0/set_work_order_qty_in_so_from_mr.py
similarity index 100%
rename from erpnext/patches/v14_0/set_work_order_qty_in_so_from_mr.py
rename to erpnext/patches/v13_0/set_work_order_qty_in_so_from_mr.py