[Zope] Dangerous "cvs update" (second report)

I was a bit too fast. Yesterdays "cvs update" seems to have almost destroyed my Zope installation.... Now, I get a "Z2 CONFLICT Competing writes at, /manage_menu", as soon as I try to open the management screen. "ConflictError: '\000\000\000\000\000\000Fk'" What wants to write to "/manage_menu" when I only open the management screen? Dieter