reglages player
commit quentin fix conflict