diff --git a/Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java b/Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java
index 7e8b4a1..f610a9e 100644
--- a/Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java
+++ b/Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java
@@ -1,9 +1,6 @@
 package com.r11.tools.xml;
 
-<<<<<<< HEAD
-=======
 import com.r11.tools.model.XMLMultipleFilesData;
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 import com.r11.tools.model.XPathQueryResult;
 import net.sf.saxon.s9api.*;
 
@@ -106,11 +103,7 @@ public class Saxon implements XmlEngine{
     }
 
     /**
-<<<<<<< HEAD
-     * This method evaluates XQuery exporession on given xml
-=======
      * This method evaluates XQuery expression on given xml
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
      * @param data xml
      * @param xquery expression
      * @return
diff --git a/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java b/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java
index f2efae1..5c64093 100644
--- a/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java
+++ b/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java
@@ -1,9 +1,6 @@
 package com.r11.tools.xml;
 
-<<<<<<< HEAD
-=======
 import com.r11.tools.model.XMLMultipleFilesData;
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 import com.r11.tools.model.XPathQueryResult;
 import org.apache.xpath.XPathAPI;
 import org.w3c.dom.Document;
diff --git a/Backend/tools-services/src/main/java/com/r11/tools/xml/XmlEngine.java b/Backend/tools-services/src/main/java/com/r11/tools/xml/XmlEngine.java
index 2995aed..7e7b8db 100644
--- a/Backend/tools-services/src/main/java/com/r11/tools/xml/XmlEngine.java
+++ b/Backend/tools-services/src/main/java/com/r11/tools/xml/XmlEngine.java
@@ -1,9 +1,6 @@
 package com.r11.tools.xml;
 
-<<<<<<< HEAD
-=======
 import com.r11.tools.model.XMLMultipleFilesData;
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 import com.r11.tools.model.XPathQueryResult;
 
 public interface XmlEngine {