edit rt_ranking
resolve conflict