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