Fixed merge conflict with Eden prefab