ec002
resolvendo o conflito