gestion des messages
fix
fix conflict
fix