clear conflict 2