diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index dda1b11859d..835ee5b6133 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -395,13 +395,9 @@ execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_post
 erpnext.patches.v14_0.disable_add_row_in_gross_profit
 erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment
 erpnext.patches.v14_0.update_posting_datetime
-<<<<<<< HEAD
 erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes
 erpnext.patches.v15_0.update_query_report
-erpnext.patches.v15_0.rename_field_from_rate_difference_to_amount_difference
-=======
 erpnext.patches.v15_0.rename_field_from_rate_difference_to_amount_difference #2025-03-18
->>>>>>> 75ab5f2bd0 (fix: set landed cost based on purchase invoice rate)
 erpnext.patches.v15_0.recalculate_amount_difference_field
 erpnext.patches.v15_0.rename_sla_fields #2025-03-12
 erpnext.patches.v15_0.set_purchase_receipt_row_item_to_capitalization_stock_item