rankall and rankhospital
fix merge conflict