After merge fixes

UOP1_Project/Assets/Scripts/Input/GameInput.cs

         m_Gameplay_ExtraAction = m_Gameplay.FindAction("ExtraAction", throwIfNotFound: true);
         m_Gameplay_RotateCamera = m_Gameplay.FindAction("RotateCamera", throwIfNotFound: true);
         m_Gameplay_MouseControlCamera = m_Gameplay.FindAction("MouseControlCamera", throwIfNotFound: true);
-		m_Gameplay_Run = m_Gameplay.FindAction("Run", throwIfNotFound: true);
+        m_Gameplay_Run = m_Gameplay.FindAction("Run", throwIfNotFound: true);
         // Menus
         m_Menus = asset.FindActionMap("Menus", throwIfNotFound: true);
         m_Menus_MoveMenuSelection = m_Menus.FindAction("MoveMenuSelection", throwIfNotFound: true);
     private IGameplayActions m_GameplayActionsCallbackInterface;
     private readonly InputAction m_Gameplay_Move;
     private readonly InputAction m_Gameplay_Jump;
+    private readonly InputAction m_Gameplay_Attack;
+    private readonly InputAction m_Gameplay_Interact;
-	private readonly InputAction m_Gameplay_Run;
+    private readonly InputAction m_Gameplay_Run;
     public struct GameplayActions
     {
         private @GameInput m_Wrapper;
         public InputAction @ExtraAction => m_Wrapper.m_Gameplay_ExtraAction;
         public InputAction @RotateCamera => m_Wrapper.m_Gameplay_RotateCamera;
         public InputAction @MouseControlCamera => m_Wrapper.m_Gameplay_MouseControlCamera;
-		public InputAction @Run => m_Wrapper.m_Gameplay_Run;
+        public InputAction @Run => m_Wrapper.m_Gameplay_Run;
         public InputActionMap Get() { return m_Wrapper.m_Gameplay; }
         public void Enable() { Get().Enable(); }
         public void Disable() { Get().Disable(); }
                 @MouseControlCamera.started -= m_Wrapper.m_GameplayActionsCallbackInterface.OnMouseControlCamera;
                 @MouseControlCamera.performed -= m_Wrapper.m_GameplayActionsCallbackInterface.OnMouseControlCamera;
                 @MouseControlCamera.canceled -= m_Wrapper.m_GameplayActionsCallbackInterface.OnMouseControlCamera;
-				@Run.started -= m_Wrapper.m_GameplayActionsCallbackInterface.OnRun;
-				@Run.performed -= m_Wrapper.m_GameplayActionsCallbackInterface.OnRun;
-				@Run.canceled -= m_Wrapper.m_GameplayActionsCallbackInterface.OnRun;
+                @Run.started -= m_Wrapper.m_GameplayActionsCallbackInterface.OnRun;
+                @Run.performed -= m_Wrapper.m_GameplayActionsCallbackInterface.OnRun;
+                @Run.canceled -= m_Wrapper.m_GameplayActionsCallbackInterface.OnRun;
             }
             m_Wrapper.m_GameplayActionsCallbackInterface = instance;
             if (instance != null)
                 @MouseControlCamera.started += instance.OnMouseControlCamera;
                 @MouseControlCamera.performed += instance.OnMouseControlCamera;
                 @MouseControlCamera.canceled += instance.OnMouseControlCamera;
-				@Run.started += instance.OnRun;
-				@Run.performed += instance.OnRun;
-				@Run.canceled += instance.OnRun;
+                @Run.started += instance.OnRun;
+                @Run.performed += instance.OnRun;
+                @Run.canceled += instance.OnRun;
-    private readonly InputAction m_Gameplay_Interact;
-    private readonly InputAction m_Gameplay_Attack;
     public GameplayActions @Gameplay => new GameplayActions(this);
 
     // Menus
         void OnExtraAction(InputAction.CallbackContext context);
         void OnRotateCamera(InputAction.CallbackContext context);
         void OnMouseControlCamera(InputAction.CallbackContext context);
+        void OnRun(InputAction.CallbackContext context);
     }
     public interface IMenusActions
     {

UOP1_Project/Packages/packages-lock.json

       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.16",
+      "version": "1.1.18",
       "depth": 1,
       "source": "registry",
       "dependencies": {