7b208bbedb
Resolve conflict in settings.ts: keep S3 logo migration imports. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>