diff --git a/helpdesk/templates/helpdesk/include/tickets.html b/helpdesk/templates/helpdesk/include/tickets.html
index 808f47b6..6c0aeb1b 100644
--- a/helpdesk/templates/helpdesk/include/tickets.html
+++ b/helpdesk/templates/helpdesk/include/tickets.html
@@ -1,6 +1,5 @@
 {% load i18n humanize %}
 
-<<<<<<< HEAD
 <!-- DataTables Example -->
 <div class="card mb-3">
     <div class="card-header">