AND simple
ADN simple
conflict fixed