Resolving conflict with fairness