diff --git a/SrcMod/Shell/Tools.cs b/SrcMod/Shell/Tools.cs
index 3747dc6..cebd629 100644
--- a/SrcMod/Shell/Tools.cs
+++ b/SrcMod/Shell/Tools.cs
@@ -4,17 +4,8 @@ namespace SrcMod.Shell;
 
 internal static class Tools
 {
-<<<<<<< HEAD
     public static JsonSerializer Serializer { get; private set; }
 
-    private static int loadingPosition = -1;
-    private static int lastLoadingBufferSize = 0;
-    private static int lastLoadingValue = -1;
-    private static float loadingBarValue = 0;
-    private static ConsoleColor loadingBarColor = Console.ForegroundColor;
-
-    public static bool LoadingBarEnabled { get; private set; }
-
     static Tools()
     {
         Serializer = JsonSerializer.Create(new()
@@ -24,8 +15,6 @@ internal static class Tools
         });
     }
 
-=======
->>>>>>> origin/shell-systems
     public static void DisplayWithPages(IEnumerable<string> lines, ConsoleColor? color = null)
     {
         int written = 0;