No conflicts. main's changes to the files this branch touches (the page cursor router in canvas.rs, hover tips in tools/comments, new tools and document methods) don't meet this branch's hunks. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>