diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 25d0f85ea6e..503eb751c41 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -476,18 +476,7 @@ cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn)
 	}
 }
 
-<<<<<<< HEAD
-cur_frm.set_query("expense_account", "items", function(doc) {
-	return {
-		query: "erpnext.controllers.queries.get_expense_account",
-		filters: {'company': doc.company }
-	}
-});
-
 cur_frm.set_query("wip_composite_asset", "items", function() {
-=======
-cur_frm.set_query("wip_composite_asset", "items", function () {
->>>>>>> a9ac0cc223 (refactor: query for expense_account moved to setup hook in purchase invoice)
 	return {
 		filters: {'is_composite_asset': 1, 'docstatus': 0 }
 	}