add conflict image