diff --git a/jeevesbot/functions.py b/jeevesbot/functions.py
index 2b55e0f..3cc3e79 100644
--- a/jeevesbot/functions.py
+++ b/jeevesbot/functions.py
@@ -17,7 +17,6 @@ def roll(notation):
     result = int(roll)
     return roll,result
 
-<<<<<<< HEAD
 # check if user has admin role and output True if it's the case.
 def checkrole(roles):
     for role in roles:
@@ -30,6 +29,3 @@ def checkchannel(channelid):
         return True
     else:
         return False
-
-=======
->>>>>>> d194332843b93f36e724aeca0dcd41c96a10ae95