diff --git a/Frontend/tools/xmlFormatter.html b/Frontend/tools/xmlFormatter.html
index fe3f5be..a200e44 100644
--- a/Frontend/tools/xmlFormatter.html
+++ b/Frontend/tools/xmlFormatter.html
@@ -63,23 +63,6 @@
 
         </div>
 
-<<<<<<< HEAD
-        <script>
-            function getProcessor() {
-                return "libxml";
-            }
-
-            function getVersion() {
-                return "1.0"
-            }
-
-            function init() {
-                configurePastingInElement("xmlArea");
-            }
-        </script>
-
-=======
->>>>>>> master
     </body>
 
 </html>