Conflito resolvido