diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 4c899b901ca..13be7f23ff7 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -49,6 +49,7 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 
 		this.frm.toggle_reqd("due_date", !this.frm.doc.is_return);
 
+<<<<<<< HEAD
 		if (this.frm.doc.repost_required && this.frm.doc.docstatus===1) {
 			this.frm.set_intro(__("Accounting entries for this invoice needs to be reposted. Please click on 'Repost' button to update."));
 			this.frm.add_custom_button(__('Repost Accounting Entries'),
@@ -68,6 +69,8 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 				}).removeClass('btn-default').addClass('btn-warning');
 		}
 
+=======
+>>>>>>> f3fda9ce98 (chore: remove stale code from sales invoice)
 		if (this.frm.doc.is_return) {
 			this.frm.return_print_format = "Sales Invoice Return";
 		}