branch test
AND simple
& simple
conflict fixed
test --no-ff
merge with no-ff