resolvido conflito