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