versao inicial
resolvendo conflitos