diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html
index 6a16b17d..b8fe16e4 100644
--- a/RIGS/templates/RIGS/event_detail.html
+++ b/RIGS/templates/RIGS/event_detail.html
@@ -201,15 +201,12 @@
             <div class="btn-group btn-page">
                 <a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
                         class="glyphicon glyphicon-edit"></span></a>
-<<<<<<< HEAD
                 {% if event.is_rig %}
                     <a href="{% url 'event_print' event.pk %}" class="btn btn-default"><span
                             class="glyphicon glyphicon-print"></span></a>
                 {% endif %}
-=======
                 <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
                         class="glyphicon glyphicon-print"></span></a>
->>>>>>> master
                 <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
                         class="glyphicon glyphicon-duplicate"></span></a>
                 {% if event.is_rig %}