a
conflict resuelto