first commit
resolvendo conflitos