add_conflict_hj6916