GameState switch
Merge conflicts
Merge conflicts