branch test
AND simple
& simple
conflic fixed
branch test
& simple