fixed update rendering
removed merge conflicts