Fixing GameHandler merge?