diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 44c66c6f527..8e8e2b25299 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -363,17 +363,7 @@ erpnext.patches.v13_0.copy_custom_field_filters_to_website_item
 erpnext.patches.v13_0.set_available_for_use_date_if_missing
 erpnext.patches.v13_0.education_deprecation_warning
 erpnext.patches.v13_0.requeue_recoverable_reposts
-<<<<<<< HEAD
 erpnext.patches.v13_0.create_accounting_dimensions_in_orders
-=======
-erpnext.patches.v14_0.discount_accounting_separation
-erpnext.patches.v14_0.delete_employee_transfer_property_doctype
-<<<<<<< HEAD
-erpnext.patches.v13_0.create_accounting_dimensions_in_orders #1
->>>>>>> d46e406db7 (fix: Patch to make accounting dimension in orders)
-=======
-erpnext.patches.v13_0.create_accounting_dimensions_in_orders
->>>>>>> cad2035e07 (chore: do not re run patch)
 erpnext.patches.v13_0.set_per_billed_in_return_delivery_note
 erpnext.patches.v13_0.update_employee_advance_status
 erpnext.patches.v13_0.job_card_status_on_hold