Add player names
Fix merge conflicts