Commit and merge branch