added plane to scene
fixed merge conflict