update tox versions
merge