Fixed merge issue in room.html