Adicionando chiclete
Resolvendo conflito de merge