git branch and commit and merge

branch merge test