added skybox
resolved conflict