added make_conflict