failed previous merge of ethManager.cpp