game.js continue
merge done