fixed prefab merge conflicts