Fix Merge Errors (Fireball / MainMenu)