diff --git a/app/worker.py b/app/worker.py
index e301806..adaa3ab 100644
--- a/app/worker.py
+++ b/app/worker.py
@@ -120,8 +120,6 @@ def idInfo(id):
     # Return the mongodb info about the file, removing IP if its present
     return check
 
-<<<<<<< HEAD
-=======
 def userInfo(id):
     # Grab user entry from userID
     user = Config.users.find_one({"userid": id})
@@ -161,7 +159,6 @@ def userInfo(id):
             }
         }
 
->>>>>>> 3063133 (dict name wrong)
 def randomHex():
     hexRand = ''.join(secrets.choice('0123456789abcdef') for _ in range(6))
     return hexRand
@@ -194,4 +191,4 @@ def resetIDPass(userid):
         Config.users.update_one({"userid": userid}, {"$set": {"idpass": hashedPass}})
         return idpass
     except:
-        return False 
\ No newline at end of file
+        return False