diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 8bdc6e51a2e..83893f5e1de 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -355,8 +355,5 @@ erpnext.patches.v13_0.update_accounts_in_loan_docs
 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
-<<<<<<< HEAD
 erpnext.patches.v13_0.update_expense_claim_status_for_paid_advances
-=======
 erpnext.patches.v13_0.create_gst_custom_fields_in_quotation
->>>>>>> 7cae669e81 (fix(India): Auto tax fetching based on GSTIN)