Fix git-pull-mac, so that the master branch also get merged