switched to template

templates/page.html

@@ -5,9 +5,6 @@
 <main>
     <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js"></script>
     <script>mermaid.initialize({startOnLoad:true});</script>
-<<<<<<< HEAD
-    {{page.content | safe}}
-=======
     <div>
         {% if page %}
             {{page.content | safe}}
@@ -15,6 +12,5 @@
             {{section.content | safe}}
         {% endif %}
     </div>
->>>>>>> template/master
 
  </main> {% endblock content %}