cleaned up game.js file
fixed conflicts