main boucle of the game - bug
fix merges
fixes deplacement issues