PCL-CVS and vc-resolve-conflicts

Hi, I use XEmacs 21.1.6, with PCL-CVS R-2_9_9 (pkg v1.51) and VC 21.1 (pkg v1.25) on Solaris 7. As mentioned in [1] and [2], PCL-CVS expects VC to contain the function "vc-resolve-conflicts"; the XEmacs version apparently does not. When I try to perform merging from the *cvs* buffer (via keystrokes "d E", which I discovered via web searching, 'cause the XEmacs PCL-CVS info page is badly out of sync), pcl-cvs complains that autoloading failed to locate "vc-resolve-conflicts". Is anyone working on this and/or rewriting VC (as mentioned in one of the threads starting at [1] and [2])? If not, does anyone know who I can contact about the FSF version of VC? Thanks, Steve Rowe TextWise-MNIS Labs [1] http://list-archive.xemacs.org/xemacs-beta/200005/msg00416.html [2] http://list-archive.xemacs.org/xemacs-beta/200009/msg00093.html