Resolve merge conflicts in:
- apps/client/src/widgets/highlights_list.ts (keep math formula handling)
- apps/server/src/routes/api/options.ts (keep isReadable/isAllowed split, drop dead getSupportedLocales)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>