add ,cc conflict description