Update conflict resolution.