clear conflict function's comment