diff --git a/_layouts/transcription.html b/_layouts/transcription.html
index b95f607..2aed166 100644
--- a/_layouts/transcription.html
+++ b/_layouts/transcription.html
@@ -3,7 +3,6 @@
{{ page.title }} | tait.tech
-<<<<<<< HEAD
{%- if page.math -%}
@@ -14,18 +13,6 @@
{% endif %}
{% contentblock extrahead %}
-=======
-
-
-
-
- {% if page.math %}
-
- {% endif %}
- {% if page.code %}
-
- {% endif %}
->>>>>>> ca770be68ffdcb836bbddb3a47786c64f4f717a7