branch b commit
branch b2 commit
resolving
Merge branch 'b'