diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 3b8c6acd836..dfff6af431a 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -468,8 +468,5 @@ erpnext.patches.v15_0.replace_http_with_https_in_sales_partner
 erpnext.patches.v15_0.delete_quotation_lost_record_detail
 erpnext.patches.v16_0.add_portal_redirects
 erpnext.patches.v16_0.complete_onboarding_steps_for_older_sites #2
-<<<<<<< HEAD
 erpnext.patches.v16_0.update_order_qty_and_requested_qty_based_on_mr_and_po
-=======
 erpnext.patches.v16_0.enable_serial_batch_setting
->>>>>>> 82c3da5b1e (feat: option to enable serial / batch features)