diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 92e7eb91418..c1f930e5dd4 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -357,12 +357,7 @@ erpnext.patches.v14_0.clear_reconciliation_values_from_singles
 erpnext.patches.v14_0.update_total_asset_cost_field
 erpnext.patches.v14_0.create_accounting_dimensions_in_reconciliation_tool
 erpnext.patches.v14_0.update_flag_for_return_invoices #2024-03-22
-<<<<<<< HEAD
-erpnext.patches.v14_0.update_pos_return_ledger_entries
-=======
-erpnext.patches.v15_0.create_accounting_dimensions_in_payment_request
 erpnext.patches.v14_0.update_pos_return_ledger_entries #2024-08-16
->>>>>>> 1721175a20 (chore: update patches.txt)
 # below migration patch should always run last
 erpnext.patches.v14_0.migrate_gl_to_payment_ledger
 erpnext.stock.doctype.delivery_note.patches.drop_unused_return_against_index # 2023-12-20