merge minigame and master