fixing name of new room?
resolve merge conflict with name