completei as instrucoes de return
resolvendo conflitos