merging players and teams - incomplete