diff --git a/fet2020/posts/models.py b/fet2020/posts/models.py
index 82c1574e..22a9c2c4 100644
--- a/fet2020/posts/models.py
+++ b/fet2020/posts/models.py
@@ -100,6 +100,7 @@ class Post(models.Model):
 
     @property
     def agenda_html(self):
+<<<<<<< HEAD
         if not self.agenda_key:
             return None
         h=ep.getPadHTML(self.agenda_key)
@@ -112,6 +113,13 @@ class Post(models.Model):
         request_logger.info("set etherpad!")
         return value
         
+=======
+        return "<h1>Agenda</h1>"
+
+    # @agenda_html.setter
+    # def agenda_html_set(self, value):
+    #    return value
+>>>>>>> 72b4b7d982139cd76d2d5389e7b906097d75a0c0
     @property
     def get_tagnames(self):
         return ["#%s" % t for t in self.tags.names()]