diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index 3e5a3071c8f..47b6f3edde5 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -774,6 +774,7 @@ $.extend(erpnext.journal_entry, {
 		} else {
 			erpnext.journal_entry.clear_fields(frm, dt, dn);
 		}
+<<<<<<< HEAD
 	},
 	set_amount_on_last_row: function (frm, dt, dn) {
 		let row = locals[dt][dn];
@@ -805,5 +806,8 @@ $.extend(erpnext.journal_entry, {
 		row.bank_account = null;
 
 		frm.refresh_field("accounts");
+=======
+		frm.get_field("accounts").grid.refresh_row(cdn);
+>>>>>>> 275844d496 (fix(journal-entry): avoid full grid re-render per row in set_exchange_rate (#58328))
 	},
 });