update versions and deps
merege