RESOLVENDO CONFLITO