Fix merge conflict marker in state_machine_manager_coverage.spec.ts. All 158 cwmp tests pass. Build status: Success

tests/unit/services/cwmp/state_machine_manager_coverage.spec.ts

@@ -90,11 +90,7 @@ describe('StateMachineManager — coverage', () => {
     // Second: BOOT event arrives on same session (same TCP connection, new Inform)
     const machine2 = await manager.startStateMachine(device, 'sess-5', { events: ['1 BOOT'] })
     // Should have preempted to MainStateMachine (same machine instance, new state machine inside)
-<<<<<<< Updated upstream
-    // Since gpnStatus=unsupported, the machine starts in critical-reads (or idle if GPV skipped)
-=======
     // Since gpnStatus=unsupported, it starts and goes directly to critical-reads
->>>>>>> Stashed changes
     const stateName = machine2.stateMachine.getCurrentStateName()
     expect(stateName === 'idle' || stateName === 'critical-reads').toBe(true)
   })