diff --git a/Resources/views/Printer/index.html.twig b/Resources/views/Printer/index.html.twig
index d2ccbfd..7386fe6 100755
--- a/Resources/views/Printer/index.html.twig
+++ b/Resources/views/Printer/index.html.twig
@@ -39,11 +39,8 @@
                 <th>Host</th>
                 <th>Serie</th>
                 <th>Local</th>
-<<<<<<< HEAD
-=======
                 <th>Contador Inicial</th>
                 <th>Contador Final</th>
->>>>>>> d4656e0e44b6f43d88cea85fd3ca4cd16f0e76fd
                 <th>Impressões</th>
                 <th>Ações</th>
             </tr>
--
libgit2 0.21.2