Update tournament statistics at the end of each tournament.
Resolve merge conflicts.