master branch is 'master' again