add_conflict_method