clear conflict files