Added Cube
fixed merge conflict