diff --git a/ResetTracker/scripts/gui.py b/ResetTracker/scripts/gui.py
index 87ab99a..391b46e 100644
--- a/ResetTracker/scripts/gui.py
+++ b/ResetTracker/scripts/gui.py
@@ -534,7 +534,7 @@ def push_data():
             live = True
             while live:
                 push_data()
-                time.sleep(5)
+                time.sleep(3)
         except Exception as e:
             input("")
 
@@ -875,7 +875,7 @@ def trackResets(cls):
             while live:
                 if not isTracking:
                     live = False
-                time.sleep(1)
+                time.sleep(3)
         except Exception as e:
             pass
         finally:
diff --git a/ResetTracker/scripts/utils.py b/ResetTracker/scripts/utils.py
index 1d25d67..818babe 100644
--- a/ResetTracker/scripts/utils.py
+++ b/ResetTracker/scripts/utils.py
@@ -7,12 +7,8 @@
 import sys
 import time
 import math
-<<<<<<< HEAD
-=======
-import sqlite3
 
 multiCheckSupported = True
->>>>>>> f9e261d8a7b015e027f253752e49f937ee8d25d5
 
 if sys.platform.startswith("win32"):
     from ctypes import create_unicode_buffer, windll
@@ -123,11 +119,11 @@ def ms_to_string(cls, ms, returnTime=False):
 
         ms = int(ms)
         td = timedelta(milliseconds=ms)
+        if returnTime:
+            return datetime(1970, 1, 1) + td
         if not timedelta(hours=0) < td < timedelta(hours=12):
             td = timedelta(days=1) - td
         t = datetime(1970, 1, 1) + td
-        if returnTime:
-            return t
         return t.strftime("%H:%M:%S")