add conflict filter