add conflict function added