diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py
index 2d76337f..d9fa28a5 100644
--- a/fet2020/posts/views.py
+++ b/fet2020/posts/views.py
@@ -49,10 +49,31 @@ def show(request, id=None):
     }
     response = render(request, 'posts/show.html', context)
     response.set_cookie("HelloWorld", "TestWert", domain="https://etherpad2.2020.fet.at")
+<<<<<<< HEAD
     ep_sessid, expires=get_ep_sessionid(request)
     response.set_cookie("sessionID",ep_sessid,expires=expires, domain=".2020.fet.at", path="/")
     #response.set_cookie("express_sid",ep_sessid,expires=expires, domain="https://andis.2020.fet.at",path="/etherpad")
     #response=add_ep_to_response(request, response  )
+=======
+    ep_sessid, expires = get_ep_sessionid(request)
+    response.set_cookie(
+        "sessionID",
+        ep_sessid,
+        expires=expires,
+        domain=".2020.fet.at",
+        path="/etherpad"
+    )
+    '''
+    response.set_cookie(
+        "express_sid",
+        ep_sessid,
+        expires=expires,
+        domain="https://andis.2020.fet.at",
+        path="/etherpad"
+    )
+    '''
+    # response=add_ep_to_response(request, response  )
+>>>>>>> a9b7ca5faead194ba253fadc59f6f1d83a8e5bc1
 
     return response