Fixed a CUP bug on erroneous conflict reports.  Patch also sent to TUM.