AND simple
test confict
conflict fixed