resolvendo bugs de js
merge