Keep the current upstream roadmap status entries and wording together with the pointer-zoom note. No feature code changes in the conflict resolution. Co-Authored-By: Codex <noreply@openai.com>