diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 5f95e13..ffd85a6 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -325,6 +325,10 @@
 erpnext.patches.v14_0.set_payroll_cost_centers
 erpnext.patches.v13_0.agriculture_deprecation_warning
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+erpnext.patches.v13_0.update_maintenance_schedule_field_in_visit
+>>>>>>> fedeb2a70f (chore: remove patch)
 erpnext.patches.v13_0.hospitality_deprecation_warning
 erpnext.patches.v13_0.update_exchange_rate_settings
 erpnext.patches.v13_0.update_asset_quantity_field
diff --git a/erpnext/patches/v13_0/set_billed_amount_in_returned_dn.py b/erpnext/patches/v13_0/set_billed_amount_in_returned_dn.py
deleted file mode 100644
index 1f86c76..0000000
--- a/erpnext/patches/v13_0/set_billed_amount_in_returned_dn.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2022, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-import frappe
-
-from erpnext.stock.doctype.delivery_note.delivery_note import update_billed_amount_based_on_so
-
-
-def execute():
-    dn_item = frappe.qb.DocType('Delivery Note Item')
-
-    so_detail_list = (frappe.qb.from_(dn_item)
-        .select(dn_item.so_detail)
-        .where(
-            (dn_item.so_detail.notnull()) &
-            (dn_item.so_detail != '') &
-            (dn_item.docstatus == 1) &
-            (dn_item.returned_qty > 0)
-    )).run()
-
-    for so_detail in so_detail_list:
-        update_billed_amount_based_on_so(so_detail[0], False)
\ No newline at end of file