From Identity-Based Conflict to Identity-Based