resolve merge conflicts with base

Author: shyam-patel-kira

.github/workflows/test.yml

@@ -62,8 +62,12 @@ jobs:
           --report debug
           --optimize
           --optimizer-runs 200
+<<<<<<< HEAD
           --no-auto-detect
           --skip script/DeployUpgradableLuminoProtocol.s.sol 
+=======
+          --no-auto-detect  
+>>>>>>> dbdfca23eee90356ceca6988d8ed8bf75f7bf156
         id: coverage
 
       # - name: Upload coverage to Codecov

test/StakeManager.t.sol

@@ -23,20 +23,20 @@ contract StakeManagerTest is Test, Constants {
         staker1 = address(0x1);
         staker2 = address(0x2);
 
-        // Deploy contracts
-        stakeManager = new StakeManager();
+        // Deploy JobManager first
         jobsManager = new JobsManager();
-        
-        // Initialize contracts
+        jobsManager.initialize(5, address(0)); // Initialize with a dummy jobs manager address first
+
+        stakeManager = new StakeManager();
         stakeManager.initialize(address(jobsManager));
-        jobsManager.initialize(5, address(stakeManager));
 
         // Fund test accounts
         vm.deal(staker1, 100 ether);
         vm.deal(staker2, 100 ether);
     }
 
     function testInitialization() public view {
+        assertEq(stakeManager.numStakers(), 0);
         assertTrue(stakeManager.hasRole(stakeManager.DEFAULT_ADMIN_ROLE(), admin));
         assertEq(stakeManager.numStakers(), 0);
     }