merged dev manually and resolved conflict in api/v1/render.html