- Resolved localization conflicts by keeping both GPS settings and room management strings - Merged room management features from main - Merged map and contacts screen updates from main