diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 9710321d075..637d56f093a 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -109,11 +109,8 @@ def get_stock_balance(
 
 	from erpnext.stock.stock_ledger import get_previous_sle
 
-<<<<<<< HEAD
-=======
 	frappe.has_permission("Item", "read", throw=True)
 
->>>>>>> 8b6a8d0c4f (fix: throw permission error (#47976))
 	if posting_date is None:
 		posting_date = nowdate()
 	if posting_time is None: