fixing game state flow
merging conflicts