collection of commits to fix merge issues and updates to the tournament module