foo1
Merge branch 'master' into newbranch1
Merge branch 'newbranch1'