diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
index 8468b236dba..6159275c5d1 100644
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
+++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
@@ -743,25 +743,12 @@ def calculate_amounts(against_loan, posting_date, payment_type=""):
 	amounts = get_amounts(amounts, against_loan, posting_date)
 
 	# update values for closure
-<<<<<<< HEAD
 	if payment_type == "Loan Closure":
 		amounts["payable_principal_amount"] = amounts["pending_principal_amount"]
 		amounts["interest_amount"] += amounts["unaccrued_interest"]
 		amounts["payable_amount"] = amounts["payable_principal_amount"] + amounts["interest_amount"]
-=======
-	if payment_type == 'Loan Closure':
-		amounts['payable_principal_amount'] = amounts['pending_principal_amount']
-		amounts['interest_amount'] += amounts['unaccrued_interest']
-<<<<<<< HEAD
-		amounts['payable_amount'] = amounts['payable_principal_amount'] + amounts['interest_amount']
-<<<<<<< HEAD
-		amounts['payable_amount'] = amounts['penalty_amount']
->>>>>>> 4e92926a52 (fix: incorrect payable amount for loan closure)
-=======
-		amounts['payable_amount'] += amounts['penalty_amount']
->>>>>>> 8c76a76154 (fix: incorrect payable amount for loan closure)
-=======
-		amounts['payable_amount'] = amounts['payable_principal_amount'] + amounts['interest_amount'] + amounts['penalty_amount']
->>>>>>> 1b2c6a5b78 (fix: Code cleanup)
+		amounts["payable_amount"] = (
+			amounts["payable_principal_amount"] + amounts["interest_amount"] + amounts["penalty_amount"]
+		)
 
 	return amounts