commit master
commit branch3
Merge branch 'branch3'