Comit inicial
resolvendo conflito