diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 8bdf5dcb759..b6708ce24b1 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -640,11 +640,8 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
 						"reference_type": inv.against_voucher_type,
 						"reference_name": inv.against_voucher,
 						"cost_center": erpnext.get_default_cost_center(company),
-<<<<<<< HEAD
 						"user_remark": f"{fmt_money(flt(inv.allocated_amount), currency=company_currency)} against {inv.against_voucher}",
-=======
 						"exchange_rate": inv.exchange_rate,
->>>>>>> c87332d5da (refactor: cr/dr note will be on single exchange rate)
 					},
 					{
 						"account": inv.account,
@@ -658,24 +655,18 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
 						"reference_type": inv.voucher_type,
 						"reference_name": inv.voucher_no,
 						"cost_center": erpnext.get_default_cost_center(company),
-<<<<<<< HEAD
 						"user_remark": f"{fmt_money(flt(inv.allocated_amount), currency=company_currency)} from {inv.voucher_no}",
-=======
 						"exchange_rate": inv.exchange_rate,
->>>>>>> c87332d5da (refactor: cr/dr note will be on single exchange rate)
 					},
 				],
 			}
 		)
 
 		jv.flags.ignore_mandatory = True
-<<<<<<< HEAD
-		jv.remark = None
 		jv.flags.skip_remarks_creation = True
-		jv.is_system_generated = True
-=======
 		jv.flags.ignore_exchange_rate = True
->>>>>>> c87332d5da (refactor: cr/dr note will be on single exchange rate)
+		jv.is_system_generated = True
+		jv.remark = None
 		jv.submit()
 
 		if inv.difference_amount != 0: