diff --git a/RIGS/templates/RIGS/event_print_page.xml b/RIGS/templates/RIGS/event_print_page.xml
index 9187e317..1559818c 100644
--- a/RIGS/templates/RIGS/event_print_page.xml
+++ b/RIGS/templates/RIGS/event_print_page.xml
@@ -15,15 +15,9 @@
 </para>
 
 <keepInFrame maxHeight="30">
-<<<<<<< HEAD
-<para style="style.event_description">
-{{ object.description|default_if_none:""|linebreaksbr }}
-    </para>
-=======
     <para style="style.event_description">
     {{ object.description|default_if_none:""|linebreaksbr }}
         </para>
->>>>>>> revision-view
 </keepInFrame>
 
 {% if invoice %}