Trying to work with player.js.erb
Fixed merge conflicts