Added partroom
Fixed merge problem