Bug do merge resolvido