manual merge PreGame