git checkout master
git merge new branch
