Modified in b1
Modified in b2
commit merge b1 & b2
commit merge b1 & b2
merage b1 & master