b1 commit
b2 commit
resolving coflict