fix conflict

diff --cc app/templates/agenda/event_list.html
index 0da98be3ce2e87bccf387da635f6924dd0022adf,15c55047f3d1e85ea7ce3f14734ac72fad15b21a..1cfa6e8c8305c3682a713f493909543a436164da
--- 1/app/templates/agenda/event_list.html
--- 2/app/templates/agenda/event_list.html
+++ b/app/templates/agenda/event_list.html
@@@ -98,8 -98,7 +98,8 @@@
      {% block event_list_event_content %}
          {% editable event.content %}
              <div class="event__description">
-                 {{ event.description_from_content|safe }}
+                 {{ event.description|safe }}
 +                <a href="{{ event.get_absolute_url }}" class="event__meta__cta">{% trans "read more" %}</a>
              </div>
          {% endeditable %}
      {% endblock %}

diff --cc app/templates/base.html
Simple merge