fixing conflicts
Merge pull request #523 from MGhanem/changing_game_nav_styles

fixing conflicts