update tariff modal, update tariff funct admins, begin update tariffsDao
eliminated conflict after pull