diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 53b3171ac64..7e7112a82cd 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -316,9 +316,6 @@ erpnext.patches.v14_0.create_accounting_dimensions_in_subcontracting_doctypes
 erpnext.patches.v14_0.fix_subcontracting_receipt_gl_entries
 erpnext.patches.v14_0.migrate_remarks_from_gl_to_payment_ledger
 erpnext.patches.v14_0.create_accounting_dimensions_for_asset_capitalization
-<<<<<<< HEAD
 erpnext.patches.v13_0.update_schedule_type_in_loans
-erpnext.patches.v14_0.update_tds_fields
-=======
 erpnext.patches.v14_0.update_partial_tds_fields
->>>>>>> 0fdde2e5c0 (feat: item wise tds calculation for purchase order)
+