diff --git a/pom.xml b/pom.xml
index 0424bee..32347ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,11 @@
     <its.ajp.port>2001</its.ajp.port>
     <!-- server port for it tests -->
     <its.server.port>2008</its.server.port>
+<<<<<<< 401716e461ee04de5d0dd9c584a1f5074d66d455
     <tomcat7Version>7.0.59</tomcat7Version>
+=======
+    <tomcat7Version>7.0.54</tomcat7Version>
+>>>>>>> use last tomcat8 version
     <tomcat8Version>8.0.14</tomcat8Version>
 
     <!-- to prevent isssues with last apache parent pom -->