More on conflict resolution.