Conflict resolution.