Initial commit
Resolvendo os conflitos