diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 6909ca2b04b..e184a3e00fd 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -1395,17 +1395,9 @@ frappe.ui.form.on('Payment Entry Reference', {
 				args: {
 					reference_doctype: row.reference_doctype,
 					reference_name: row.reference_name,
-<<<<<<< HEAD
-					party_account_currency: frm.doc.payment_type=="Receive" ?
-						frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency
-=======
-					party_account_currency:
-						frm.doc.payment_type == "Receive"
-							? frm.doc.paid_from_account_currency
-							: frm.doc.paid_to_account_currency,
+					party_account_currency:	frm.doc.payment_type == "Receive" ? frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency,
 					party_type: frm.doc.party_type,
 					party: frm.doc.party,
->>>>>>> f331f9b15c (fix: Fetch outstanding and total amount for reference journal entry)
 				},
 				callback: function(r, rt) {
 					if(r.message) {
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 5218f0ea344..fa5aabe1268 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -1919,15 +1919,10 @@ def get_outstanding_on_journal_entry(voucher_no, party_type, party):
 
 
 @frappe.whitelist()
-<<<<<<< HEAD
-def get_reference_details(reference_doctype, reference_name, party_account_currency):
-	total_amount = outstanding_amount = exchange_rate = None
-=======
 def get_reference_details(
 	reference_doctype, reference_name, party_account_currency, party_type=None, party=None
 ):
-	total_amount = outstanding_amount = exchange_rate = account = None
->>>>>>> f331f9b15c (fix: Fetch outstanding and total amount for reference journal entry)
+	total_amount = outstanding_amount = exchange_rate = None
 
 	ref_doc = frappe.get_doc(reference_doctype, reference_name)
 	company_currency = ref_doc.get("company_currency") or erpnext.get_company_currency(ref_doc.company)