One conflict, in the style editor's hand-off script. #568 bounded the wait for
the widget bundle (retries, MAX_RETRIES, giveUp) and kept the value-diffing
fallbackIsDirty guard; this branch replaced that guard, because it raced the
font-selector widget on a plain page load and removed the editor with nobody
touching anything.
Resolved by keeping both halves that were right: #568's bounded retry, and the
isTrusted watcher in place of the value diff. No reference to fallbackIsDirty
remains, the guard still backs off for a genuine in-progress edit, and the
selective removal of only the widget's own blocks merged cleanly.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>