diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 66c5ae28478..c592d31f4dd 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -1051,22 +1051,10 @@ 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"):
-		return item_price[0][1]
-=======
-=======
-	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)
+	is_free_item = params.get("items", [{}])[0].get("is_free_item")
 
-	if item_price and item_price[0].uom == pctx.uom and not is_free_item:
-		return item_price[0].price_list_rate
->>>>>>> 9597b1a69e (fix: Batch Price gets updated only if it is a billed item)
+	if item_price and item_price[0][2] == params.get("uom") and not is_free_item:
+		return item_price[0][1]
 
 	return 0.0