diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index f64a51ff7f3..4a452c30424 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -357,12 +357,7 @@ erpnext.patches.v13_0.remove_unknown_links_to_prod_plan_items # 24-03-2022
 erpnext.patches.v13_0.rename_non_profit_fields
 erpnext.patches.v13_0.enable_ksa_vat_docs #1
 erpnext.patches.v13_0.create_gst_custom_fields_in_quotation
-<<<<<<< HEAD
 erpnext.patches.v13_0.update_expense_claim_status_for_paid_advances
 erpnext.patches.v13_0.set_return_against_in_pos_invoice_references
 erpnext.patches.v13_0.copy_custom_field_filters_to_website_item
-=======
-erpnext.patches.v13_0.copy_custom_field_filters_to_website_item
-erpnext.patches.v14_0.delete_employee_transfer_property_doctype
 erpnext.patches.v13_0.create_accounting_dimensions_in_orders
->>>>>>> 82a0635c66 (fix: Consistent accounting dimensions across Sales and Purchase docs)