diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 1087f64276d..aa753e2ba5b 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -419,4 +419,10 @@ erpnext.patches.v15_0.remove_sales_partner_from_consolidated_sales_invoice
 erpnext.patches.v15_0.repost_gl_entries_with_no_account_subcontracting #2025-08-04
 execute:frappe.db.set_single_value("Accounts Settings", "fetch_valuation_rate_for_internal_transaction", 1)
 erpnext.patches.v15_0.add_company_payment_gateway_account
+<<<<<<< HEAD
 erpnext.patches.v15_0.update_uae_zero_rated_fetch
+=======
+erpnext.patches.v16_0.update_serial_no_reference_name
+erpnext.patches.v16_0.set_invoice_type_in_pos_settings
+erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter
+>>>>>>> 3cf765d985 (fix: add patch)
diff --git a/erpnext/patches/v15_0/update_fieldname_in_accounting_dimension_filter.py b/erpnext/patches/v15_0/update_fieldname_in_accounting_dimension_filter.py
new file mode 100644
index 00000000000..50d3fbe6f9c
--- /dev/null
+++ b/erpnext/patches/v15_0/update_fieldname_in_accounting_dimension_filter.py
@@ -0,0 +1,23 @@
+import frappe
+from frappe.query_builder import DocType
+
+
+def execute():
+	ADF = DocType("Accounting Dimension Filter")
+	AD = DocType("Accounting Dimension")
+
+	accounting_dimension_filter = (
+		frappe.qb.from_(ADF)
+		.join(AD)
+		.on(AD.document_type == ADF.accounting_dimension)
+		.select(ADF.name, AD.fieldname)
+	).run(as_dict=True)
+
+	for doc in accounting_dimension_filter:
+		frappe.db.set_value(
+			"Accounting Dimension Filter",
+			doc.name,
+			"fieldname",
+			doc.fieldname,
+			update_modified=False,
+		)