diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
index 0cd94154e59..18803504eb1 100644
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
+++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
@@ -388,11 +388,7 @@ class LoanRepayment(AccountsController):
 	def make_gl_entries(self, cancel=0, adv_adj=0):
 		gle_map = []
 		if self.shortfall_amount and self.amount_paid > self.shortfall_amount:
-<<<<<<< HEAD
-			remarks = _("Shortfall Repayment of {0}.\nRepayment against Loan: {1}").format(
-=======
 			remarks = "Shortfall repayment of {0}.<br>Repayment against loan {1}".format(
->>>>>>> 74dbf8c5d9 (Add reference number to repayment remarks)
 				self.shortfall_amount, self.against_loan
 			)
 		elif self.shortfall_amount:
@@ -400,14 +396,10 @@ class LoanRepayment(AccountsController):
 				self.shortfall_amount, self.against_loan
 			)
 		else:
-<<<<<<< HEAD
-			remarks = _("Repayment against Loan: ") + self.against_loan
-=======
 			remarks = "Repayment against loan " + self.against_loan
 
 		if self.reference_number:
 			remarks += "with reference no. {}".format(self.reference_number)
->>>>>>> 74dbf8c5d9 (Add reference number to repayment remarks)
 
 		if self.repay_from_salary:
 			payment_account = self.payroll_payable_account