diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 087a422c90b..063be1cb98c 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -305,11 +305,8 @@ erpnext.patches.v13_0.add_custom_field_for_south_africa #2
 erpnext.patches.v13_0.rename_discharge_ordered_date_in_ip_record
 erpnext.patches.v13_0.migrate_stripe_api
 erpnext.patches.v13_0.reset_clearance_date_for_intracompany_payment_entries
-<<<<<<< HEAD
-=======
 erpnext.patches.v13_0.einvoicing_deprecation_warning
 erpnext.patches.v13_0.custom_fields_for_taxjar_integration
 erpnext.patches.v14_0.delete_einvoicing_doctypes
->>>>>>> 7004944cc0 (feat: Taxjar Integration update (#27143))
 erpnext.patches.v13_0.set_operation_time_based_on_operating_cost
 erpnext.patches.v13_0.validate_options_for_data_field