add room prefab
merge conflict