added game object
fixed merge conflicts