Add conflict resolution.