The previous commit (ab0d671) was made while a stash had partial overlapping changes; the conflict-marker text got committed inline in three files. JSX still parsed (the markers happen to live between elements) so the build didn't catch it, but the rendered output had '>>>>>>>' and '=======' bleeding into the DOM as text. Clean the merged version: keep the new NotFoundPanel branch and drop the old "Error / Could not resolve handle" block plus the now-orphan outer <div> that wrapped both.