fixed merge conflicts on player.rb