Conflict resolution
Conflict resolution.