diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/log/Slf4jLog.java b/jetty-util/src/main/java/org/eclipse/jetty/util/log/Slf4jLog.java
index 5601b520a40..930a6f600c4 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/Slf4jLog.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/Slf4jLog.java
@@ -37,11 +37,7 @@ public class Slf4jLog implements Logger
         }
         catch (ClassNotFoundException ex)
         {
-<<<<<<< Updated upstream
             ex.printStackTrace(System.err);
-=======
-            ex.printStackTrace();
->>>>>>> Stashed changes
             throw new NoClassDefFoundError("org.slf4j.impl.StaticLoggerBinder");
         }