add ranks
Fixed conflict