Added a cube to test merge conflicts.