add conflict