State machine jeu
merge