Add tournament manager and corresponding logic.
Resolve non-existent merge conflicts.