branch test
and simple
& simple
conflict fixed
stage 1