Update ConflictHelper doc