commitando algo
resolvendo conflitos