diff --git a/eZ/Bundle/EzPublishDebugBundle/Resources/views/Profiler/layout.html.twig b/eZ/Bundle/EzPublishDebugBundle/Resources/views/Profiler/layout.html.twig
index 22b9e27cd83..7e2f1d34b8c 100644
--- a/eZ/Bundle/EzPublishDebugBundle/Resources/views/Profiler/layout.html.twig
+++ b/eZ/Bundle/EzPublishDebugBundle/Resources/views/Profiler/layout.html.twig
@@ -121,4 +121,3 @@
         </table>
     {% endif %}
 {% endblock %}
->>>>>>> 4889995737ea7a28d1f0b072c9c6ef31463cad17