some changes made to playerSelector.js
resolved some merge conflicts