diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 5a87a4c5014..558eeaa6d35 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -625,17 +625,9 @@ def update_reference_in_journal_entry(d, journal_entry, do_not_save=False):
 	jv_detail = journal_entry.get("accounts", {"name": d["voucher_detail_no"]})[0]
 
 	# Update Advance Paid in SO/PO since they might be getting unlinked
-<<<<<<< HEAD
-	if jv_detail.get("reference_type") in ("Sales Order", "Purchase Order"):
-		frappe.get_doc(jv_detail.reference_type, jv_detail.reference_name).set_total_advance_paid()
-=======
 	update_advance_paid = []
-	advance_payment_doctypes = frappe.get_hooks(
-		"advance_payment_receivable_doctypes"
-	) + frappe.get_hooks("advance_payment_payable_doctypes")
-	if jv_detail.get("reference_type") in advance_payment_doctypes:
+	if jv_detail.get("reference_type") in ["Sales Order", "Purchase Order"]:
 		update_advance_paid.append((jv_detail.reference_type, jv_detail.reference_name))
->>>>>>> d9a0494fc3 (fix: advance paid amount and ledger entries against SO/PO)
 
 	if flt(d["unadjusted_amount"]) - flt(d["allocated_amount"]) != 0:
 		# adjust the unreconciled balance
@@ -709,18 +701,8 @@ def update_reference_in_payment_entry(
 		existing_row = payment_entry.get("references", {"name": d["voucher_detail_no"]})[0]
 
 		# Update Advance Paid in SO/PO since they are getting unlinked
-<<<<<<< HEAD
-		if existing_row.get("reference_doctype") in ("Sales Order", "Purchase Order"):
-			frappe.get_doc(
-				existing_row.reference_doctype, existing_row.reference_name
-			).set_total_advance_paid()
-=======
-		advance_payment_doctypes = frappe.get_hooks(
-			"advance_payment_receivable_doctypes"
-		) + frappe.get_hooks("advance_payment_payable_doctypes")
-		if existing_row.get("reference_doctype") in advance_payment_doctypes:
+		if existing_row.get("reference_doctype") in ["Sales Order", "Purchase Order"]:
 			update_advance_paid.append((existing_row.reference_doctype, existing_row.reference_name))
->>>>>>> d9a0494fc3 (fix: advance paid amount and ledger entries against SO/PO)
 
 		if d.allocated_amount <= existing_row.allocated_amount:
 			existing_row.allocated_amount -= d.allocated_amount