tree add
AND simple
& simple
conflict fixed
test 5