branch test
add simple
AND
& simple
conflict fixed