solved conflicts cloudRender.js