diff --git a/Resources/views/Formula/plugin.js.html.twig b/Resources/views/Formula/plugin.js.html.twig
index a209087..7098b4a 100644
--- a/Resources/views/Formula/plugin.js.html.twig
+++ b/Resources/views/Formula/plugin.js.html.twig
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <script>
     (function () {
         'use strict';
@@ -69,6 +68,3 @@
         tinymce.claroline.plugins.formula = true;
     }());
 </script>
-=======
-<script src="{{ asset('tinymce/plugins/formula/plugin.min.js') }}"></script>
->>>>>>> 3529886f720e07cc8e67c06750c3575638531afe