Resolvendo bugs
aaa
resolvendo conflito