Merge branches

git merge branch