merge hiphip55 GameController and edit popup at end game