diff --git a/pom.xml b/pom.xml
index 32347ab..2e50da3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
     <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
     <!-- Test settings -->
     <maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile>
-    <surefire.version>2.18</surefire.version>
+    <surefire.version>2.18.1</surefire.version>
     <failsafe.version>${surefire.version}</failsafe.version>
 
     <junit.version>4.10</junit.version>
@@ -73,11 +73,7 @@
     <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 -->
diff --git a/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java b/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
index e2fea53..905bef0 100644
--- a/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
+++ b/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
@@ -134,8 +134,6 @@
 
         verifier.setCliOptions( getCliOptions() );
 
-        verifier.setLogFileName( "foo.log" );
-
         verifier.executeGoal( getGoal() );
 
         verifier.displayStreamBuffers();
diff --git a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
index 09c08a8..fe6ccb2 100644
--- a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
+++ b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
@@ -22,6 +22,7 @@
 import org.apache.catalina.WebResource;
 import org.apache.catalina.WebResourceRoot;
 import org.apache.catalina.WebResourceSet;
+import org.apache.catalina.loader.WebappClassLoaderBase;
 import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.webresources.EmptyResource;
 import org.apache.catalina.webresources.FileResource;
@@ -344,8 +345,6 @@
 
             final ClassRealm pluginRealm = getTomcatClassLoader();
 
-            final WebResourceRoot previous = context.getResources();
-
             context.setResources(
                 new MyDirContext( new File( project.getBuild().getOutputDirectory() ).getAbsolutePath(), //
                                   getPath(), //