basic merging test 1
basic merging test 2
basic merging test 3
Merge branch 'b1'