conflicts xffm4-cvs
