conflicts eet-cvs
