diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 8e8e2b25299..f77ad02c95f 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -363,7 +363,13 @@ 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
+erpnext.patches.v13_0.create_accounting_dimensions_in_orders #1
+>>>>>>> d46e406db7 (fix: Patch to make accounting dimension in orders)
 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
diff --git a/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py b/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py
index 7e6e8200852..8e6bce66fe4 100644
--- a/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py
+++ b/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py
@@ -33,7 +33,10 @@ def execute():
 				"insert_after": insert_after_field,
 			}
 
-			create_custom_field(doctype, df, ignore_validate=True)
-			frappe.clear_cache(doctype=doctype)
+			try:
+				create_custom_field(doctype, df, ignore_validate=True)
+				frappe.clear_cache(doctype=doctype)
+			except Exception as e:
+				pass
 
 		count += 1