diff --git a/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json b/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
index 82e871d0fff..e47b51ae028 100644
--- a/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
+++ b/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
@@ -59,11 +59,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-03-06 07:11:57.739619",
-=======
  "modified": "2024-11-05 16:07:47.307971",
->>>>>>> 7cc111f790 (fix: set correct unallocated amount in Payment Entry (#43958))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry Deduction",
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 1828cfa031f..f53769155bd 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -380,12 +380,7 @@ erpnext.patches.v15_0.add_disassembly_order_stock_entry_type #1
 erpnext.patches.v15_0.set_standard_stock_entry_type
 erpnext.patches.v15_0.link_purchase_item_to_asset_doc
 erpnext.patches.v14_0.update_currency_exchange_settings_for_frankfurter
-<<<<<<< HEAD
 erpnext.patches.v15_0.update_task_assignee_email_field_in_asset_maintenance_log
 erpnext.patches.v15_0.update_sub_voucher_type_in_gl_entries
 erpnext.patches.v14_0.update_stock_uom_in_work_order_item
-=======
-erpnext.patches.v15_0.migrate_old_item_wise_tax_detail_data_format
 erpnext.patches.v15_0.set_is_exchange_gain_loss_in_payment_entry_deductions
-erpnext.patches.v14_0.update_stock_uom_in_work_order_item
->>>>>>> 7cc111f790 (fix: set correct unallocated amount in Payment Entry (#43958))