merge 1
b1
a1
Merge branch 'b1'
remove a1 b1
modify b - b1
modify b - b2
merge with b1 - modify b