functioning game
fixed merge conflict