diff --git a/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
index b5b343e9166..a57a6b5e8c5 100644
--- a/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
@@ -29,7 +29,7 @@ public PanicBunkerTab()
         MinOverallMinutes.OnTextEntered += args => SendMinOverallMinutes(args.Text);
         MinOverallMinutes.OnFocusExit += args => SendMinOverallMinutes(args.Text);
         _minOverallMinutes = MinOverallMinutes.Text;
-<<<<<<< HEAD
+
         // Corvax-VPNGuard-Start
         var haveSecrets = IoCManager.Instance!.TryResolveType<ISharedSponsorsManager>(out _); // TODO: Probably need better way to detect Secrets module
         if (haveSecrets)
@@ -38,8 +38,7 @@ public PanicBunkerTab()
             DenyVPN.OnPressed += _ => SendDenyVpn(DenyVPN.Pressed);
         }
         // Corvax-VPNGuard-End
-=======
->>>>>>> 6a78497d1aaf949d64f9a9ab519e2c2c309d92fa
+
     }
 
     private void SendMinAccountAge(string text)
@@ -92,9 +91,6 @@ public void UpdateStatus(PanicBunkerStatus status)
 
         MinOverallMinutes.Text = status.MinOverallMinutes.ToString();
         _minOverallMinutes = MinOverallMinutes.Text;
-<<<<<<< HEAD
         DenyVPN.Pressed = status.DenyVpn; // Corvax-VPNGuard
-=======
->>>>>>> 6a78497d1aaf949d64f9a9ab519e2c2c309d92fa
     }
 }
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index a20f20f24e0..8b9c56e1e0b 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -11,9 +11,11 @@
 using Content.Server.Database;
 using Content.Server.GameTicking;
 using Content.Server.Preferences.Managers;
+using Content.Shared.GameTicking;
 using Content.Shared.CCVar;
 using Content.Shared.Corvax.CCCVars;
 using Content.Shared.Players.PlayTimeTracking;
+using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Network;
diff --git a/RobustToolbox b/RobustToolbox
index bf8054b1813..ec794ce4e46 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit bf8054b181392ec9a7eb9f4fea94f66837ed4a71
+Subproject commit ec794ce4e4693069d3b3ebf7a88ead5ff2f860e0