And simple
conflict fixed