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