2nd commit
3rd commit
merging in master from b1
merging from b2