Follow-Up: Negotiating Diversity Conflicts