branch 2 commit
branch 1 commit
Merge branch 'newbranch21'
merge both