add position in the ranking
fix merge conflicts