first commit
resolvendo conflito