from dev branch to local master and up to origin/master