diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index d9cedab..8e74daa 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -316,5 +316,10 @@
 erpnext.patches.v14_0.rename_ongoing_status_in_sla_documents
 erpnext.patches.v14_0.migrate_crm_settings
 erpnext.patches.v13_0.rename_ksa_qr_field
+<<<<<<< HEAD
 erpnext.patches.v13_0.disable_ksa_print_format_for_others # 16-12-2021
-erpnext.patches.v14_0.add_default_exit_questionnaire_notification_template
\ No newline at end of file
+erpnext.patches.v14_0.add_default_exit_questionnaire_notification_template
+=======
+erpnext.patches.v13_0.disable_ksa_print_format_for_others
+erpnext.patches.v13_0.update_tax_category_for_rcm #1
+>>>>>>> b33fd6acc7 (fix: Is Reverse Charge check in Tax Category)