Fixed merge request in player.jade