mudancas da dani
resolvendo merge