I figured it out, read back my CVS log and it merged the local file and the cvs rep. rcons.c because I had made local changes to it. Thanks for the help though! It's made it through make depend and in the process of make now. Chris