diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index ac446fd427..9d055b373a 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -456,13 +456,9 @@ erpnext.patches.v9_0.add_healthcare_domain
 erpnext.patches.v9_0.set_variant_item_description
 erpnext.patches.v9_0.set_uoms_in_variant_field
 erpnext.patches.v9_0.copy_old_fees_field_data
-<<<<<<< HEAD
 execute:frappe.delete_doc_if_exists("DocType", "Program Fee")
 erpnext.patches.v9_0.set_pos_profile_name
 erpnext.patches.v9_0.remove_non_existing_warehouse_from_stock_settings
 execute:frappe.delete_doc_if_exists("DocType", "Program Fee")
 erpnext.patches.v9_0.update_employee_loan_details
-erpnext.patches.v9_2.delete_healthcare_domain_default_items
-=======
-erpnext.patches.v9_0.set_bypasscreditlimitcheckatsalesorder_in_customer
->>>>>>> b883e4ee0d5a1fdbb8c25fe95f7af6b76d07b099
+erpnext.patches.v9_2.delete_healthcare_domain_default_items
\ No newline at end of file