added cube to scene
fixed merge conflict