diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index a98cb450eb3..92f5602d4d8 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -742,6 +742,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 		});
 	}
 
+<<<<<<< HEAD
 	add_taxes_from_item_tax_template(item_tax_map) {
 		let me = this;
 
@@ -762,6 +763,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 		}
 	}
 
+=======
+>>>>>>> a700345cee (refactor: Remove duplicate inherited method (#46030))
 	serial_no(doc, cdt, cdn) {
 		var me = this;
 		var item = frappe.get_doc(cdt, cdn);