rendering scenes
Fixed merge conflicts.