add to branch
commit b1 branch
commit b2
fix conflict
commit b3
merger without ff
a vulcan ship