add conflict fun