branch test
add AND simple
add & simple
conflict fixed