diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 358dbd1e86a..b2e2e7dac84 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -1126,13 +1126,8 @@ def get_billed_amount_against_po(po_items):
 def update_billing_percentage(pr_doc, update_modified=True, adjust_incoming_rate=False):
 	# Update Billing % based on pending accepted qty
 	buying_settings = frappe.get_single("Buying Settings")
-<<<<<<< HEAD
 	over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")
-=======
-	over_billing_allowance, role_allowed_to_over_bill = frappe.get_single_value(
-		"Accounts Settings", ["over_billing_allowance", "role_allowed_to_over_bill"]
-	)
->>>>>>> 04127019f9 (fix: allow allowed roles to bypass over billing validation)
+	role_allowed_to_over_bill = frappe.db.get_single_value("Accounts Settings", "role_allowed_to_over_bill")
 
 	total_amount, total_billed_amount, pi_landed_cost_amount = 0, 0, 0
 	item_wise_returned_qty = get_item_wise_returned_qty(pr_doc)