fixes issue with non-unique ranks
merge dev
fixes issue with adding new fighters
merges dev