diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
index d0559a51847..8468b236dba 100644
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
+++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
@@ -752,6 +752,7 @@ def calculate_amounts(against_loan, posting_date, payment_type=""):
 	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']
@@ -759,5 +760,8 @@ def calculate_amounts(against_loan, posting_date, payment_type=""):
 =======
 		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)
 
 	return amounts