merges everything to master branch