branch test
AND simple
& simple
confilct fixed?