what happened to the old versions of cvs??? it did a perfectly good merge and now if _any_ file is modified by two people, it marks totally independent modifications as "conflicts". this is stupid, and i have a lot of files to update, and a lot of "conflicts" to remove.