xemacsweb: spurious CVS conflicts in generated pages