git merge master