resolve conflict and add group in ranking table