commit from branch 2
commit from master
Merge branch 'branch2'