one last fix for SceneEditor merging