Fixed merge issue in GameManager