a4
b3
Merge branch 'a' into b
b4
Merge branch 'b'