resolvendo o conflito