commiting from a branch
Merge branch 'branch1'