branch test
ssss
AND simple
& simple
conflict fixed