diff --git a/fet2020/fet2020/settings.py b/fet2020/fet2020/settings.py
index 4c2095c1..8f60ff18 100644
--- a/fet2020/fet2020/settings.py
+++ b/fet2020/fet2020/settings.py
@@ -32,7 +32,7 @@ LOGGING = {
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-SESSION_COOKIE_DOMAIN = ".2020.fet.at"
+#SESSION_COOKIE_DOMAIN = ".2020.fet.at"
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
diff --git a/fet2020/members/views.py b/fet2020/members/views.py
index 7ec72fa9..f1aa7575 100644
--- a/fet2020/members/views.py
+++ b/fet2020/members/views.py
@@ -38,7 +38,7 @@ def index(request, slug=None, filter=None):
 
     return render(request, 'members/index.html', context)
 
-<<<<<<< HEAD
+
 def show_job(request, slug=None):
     job=Job.objects.get(slug=slug)
     return render(request, 'members/show_job.html', {"job": job})
@@ -57,8 +57,6 @@ def list(request, filter=None):
         members=deque(Member.all_members.filter(role=filter).all())
 
     return render(request, 'members/list.html',{"members": members})
-=======
->>>>>>> origin/master
 
 class MemberViewSet(viewsets.ModelViewSet):
     """
diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py
index 9823d451..07ca66db 100644
--- a/fet2020/posts/views.py
+++ b/fet2020/posts/views.py
@@ -10,6 +10,7 @@ from rest_framework import viewsets
 # from rest_framework import permissions
 
 from .models import Post, PostSerializer
+from documents import add_ep_to_response, get_ep_sessionid, get_pad_link
 
 from collections import deque
 
@@ -42,10 +43,17 @@ def show(request, id=None):
     context = {
         "post": p,
         "next": get_next_dict().get(p.slug, None),
-        "related_posts": p.tags.similar_objects()
+        "related_posts": p.tags.similar_objects(),
+        "ep_link": get_pad_link(p.slug+"-agenda")
     }
-    return render(request, 'posts/show.html', context)
+    response=render(request, 'posts/show.html', context)
+    response.set_cookie("HelloWorld", "TestWert", domain="https://etherpad2.2020.fet.at")
+    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  )
 
+    return response
 
 ###########
 # HELPERS #
diff --git a/fet2020/templates/posts/show.html b/fet2020/templates/posts/show.html
index e0cc5c0e..c481ade1 100644
--- a/fet2020/templates/posts/show.html
+++ b/fet2020/templates/posts/show.html
@@ -31,6 +31,7 @@
  <a href="{% url 'posts.show' next %}">Nächster Artikel</a>
 {{post.event_start}}
 {{post.event_end}}
+<a href="{{ep_link}}">EP</a>
 <strong>{{post.subtitle | tags_to_url }}</strong>
 <hr>
 {{post.body | safe}}