{% extends "layout.html" %} {% block header_addition %} {% endblock %} {% block content %}
Resolve Merge Conflict
{% endblock %}