Fixing merge conflicts

UOP1_Project/Assets/Scripts/Gameplay/GameStateSO.cs

 {
     private GameState _currentGameState = default;
     private GameState _previousGameState = default; 
-    public GameState CurrentGameState => CurrentGameState;
+    public GameState CurrentGameState => _currentGameState;
 
     public void UpdateGameState( GameState newGameState)
 	{