updated dependencies
build new version
fixed merge conflicts