branch test
ANDsimple
& simple
confilict fixed