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