Fixed up scene merge