before changes
changes in b2
changes in b1
Merge branch 'testing'
merge done