Fixed game.js conflict