Commit inicial
resolvendo conflitos