AND simple
conflict fixed