dspec room and server addition
fixing merging problem