conflicts  cvs