branch a
branch b
Merge branch 'b'
roh