Branch commit
added a file on b1 branch
commit on master
Merge branch 'b1'