branch test
AND simple
conflict fixed
&& simple
& simple
conflict fixed