Conflict resolution
Stage 1: Conflict resolution.