Never mind - looks to be a cvs merge issue.  I removed the
offending file and checked it back out and the embedded merge
text is now gone... ah well.  Apologies for the noise.  -- Ken