branch test
AND simple
&&simple
conflict fixed