diff --git a/uniSupportOnline/UsoForum/__pycache__/views.cpython-36.pyc b/uniSupportOnline/UsoForum/__pycache__/views.cpython-36.pyc
index 0bc624d..86d95ab 100644
Binary files a/uniSupportOnline/UsoForum/__pycache__/views.cpython-36.pyc and b/uniSupportOnline/UsoForum/__pycache__/views.cpython-36.pyc differ
diff --git a/uniSupportOnline/UsoForum/views.py b/uniSupportOnline/UsoForum/views.py
index 5473cd0..62d8fae 100644
--- a/uniSupportOnline/UsoForum/views.py
+++ b/uniSupportOnline/UsoForum/views.py
@@ -120,12 +120,7 @@ def help(request):
         otherPerson = rowreal[0][0]
     try:
         row = session.execute(
-<<<<<<< HEAD
             "SELECT senderid, senderusername, messagecontent, sent_at from unisupport.messages WHERE receiverid = %s ALLOW FILTERING;",[usernameId])
-=======
-            "SELECT senderid, senderusername, messagecontent, sent_at from unisupport.messages WHERE receiverid = %s ALLOW FILTERING;",
-            usernameId)
->>>>>>> 2bf339a4019a8e6426de714eab40583bf9f416d8
         row = sorted(row, key=lambda x: x[3])
     except BaseException:
         row = []