for file-conflict progress bar Also did some CVS cleanup, removing some of the autogenerated files that shouldn't have been there