branch test
AND simple
& simple
conflict fixed
and merge
merge with on-ff