Fixed up scene after merge