diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index da2e362cf27..861aa22b03c 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -65,7 +65,11 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends (
 	refresh(doc, dt, dn) {
 		const me = this;
 		super.refresh();
+<<<<<<< HEAD
 		if (cur_frm.msgbox && cur_frm.msgbox.$wrapper.is(":visible")) {
+=======
+		if (this.frm?.msgbox && this.frm.msgbox.$wrapper.is(":visible")) {
+>>>>>>> 5643385c22 (fix: attribute 'msgbox' not found in sales invoice.js)
 			// hide new msgbox
 			cur_frm.msgbox.hide();
 		}