diff --git a/erpnext/accounts/report/utils.py b/erpnext/accounts/report/utils.py
index bf604a36db0..64943db96ba 100644
--- a/erpnext/accounts/report/utils.py
+++ b/erpnext/accounts/report/utils.py
@@ -146,8 +146,17 @@ def get_appropriate_company(filters):
 	return company
 
 
+<<<<<<< HEAD
 @frappe.whitelist()
 def get_invoiced_item_gross_margin(sales_invoice=None, item_code=None, company=None, with_item_data=False):
+=======
+def get_invoiced_item_gross_margin(
+	sales_invoice: str | None = None,
+	item_code: str | None = None,
+	company: str | None = None,
+	with_item_data: bool = False,
+):
+>>>>>>> e29535f29c (fix(report_utils): remove unnecessary whitelist decorator on `get_invoiced_item_gross_margin`)
 	from erpnext.accounts.report.gross_profit.gross_profit import GrossProfitGenerator
 
 	sales_invoice = sales_invoice or frappe.form_dict.get("sales_invoice")