new file created
Merge branch 'b2'