branch test
AND simple
branch test
& simple
conflict fixed