[Icedmist]

fix: git conflict

Summary

Related issue

Type of change

• Bug fix
• New feature
• Documentation
• Refactor or maintenance
• Tests
• Security or privacy improvement

Implementation details

How was this tested?

• Lint
• Type check
• Unit or integration tests
• Build
• Manual testing
• Not applicable (explain below)

Testing notes:

UI changes

Data, privacy, and AI considerations

• No database changes
• Database migrations included and tested, if applicable
• RLS and authorization behavior reviewed, if applicable
• No secrets or private community data included
• AI output remains advisory and does not independently verify community problems, if applicable
• Documentation updated where needed

Contributor checklist

• I read CONTRIBUTING.md.
• My changes are focused and follow the project conventions.
• I added or updated tests where appropriate.
• I updated relevant documentation.
• I have not included unrelated changes.