diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 71a58e7f836..66c5ae28478 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -1051,6 +1051,7 @@ def get_batch_based_item_price(params, item_code) -> float:
 	if not item_price:
 		item_price = get_item_price(params, item_code, ignore_party=True, force_batch_no=True)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 	if item_price and item_price[0][2] == params.get("uom"):
@@ -1059,6 +1060,9 @@ def get_batch_based_item_price(params, item_code) -> float:
 =======
 	is_free_item = pctx.get('items', [{}])[0].get('is_free_item')
 >>>>>>> 1a56b83054 (fix: Batch Price gets updated only if it is a billed item)
+=======
+	is_free_item = pctx.get("items", [{}])[0].get("is_free_item")
+>>>>>>> 0a2193e458 (chore: linter fix)
 
 	if item_price and item_price[0].uom == pctx.uom and not is_free_item:
 		return item_price[0].price_list_rate