When part of Use cloud's discard fails, the redraw that follows puts the
user's version back on every refused entity, held or not; holding one
kept the cloud's version on screen while the work still waited.

A teammate's change held back by a hold the user let go of during the
discard waited for a reapply that conflict resolution then cleared. It
now resumes once resolution ends.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>