branch test
AND Simple
& simple
conflict fixed