icy 364c6081af Resolve merge conflicts with dev branch ...

Resolved conflicts in:
- api/server.go: Preserved beta_mode config and user permission checks
- manager/trader_manager.go: Kept optimized concurrent competition data with caching

Maintained all performance optimizations while merging new features from dev.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

2025-11-04 01:36:54 +08:00

..

server.go

Resolve merge conflicts with dev branch

2025-11-04 01:36:54 +08:00