Switching to live mode for testing
Fixes
Testing latest fixes
fixing
Fixes
Switching to app build mode
Fixing conflicts