branch test
branch 1
AND simple
& simple
conflict fixed
and simple
and simple
and simple
& simple
conflict fixed