clear conflict