Take main's versions of conflicting dual viewer files as base. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>