diff --git a/enterprise-patterns/front-controller-pattern/pom.xml b/enterprise-patterns/front-controller-pattern/pom.xml
index d1868b81af..dbcd4f1b1d 100644
--- a/enterprise-patterns/front-controller-pattern/pom.xml
+++ b/enterprise-patterns/front-controller-pattern/pom.xml
@@ -31,11 +31,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-<<<<<<< HEAD
-                <version>9.3.11.v20160721</version>
-=======
                 <version>9.4.0.M1</version>
->>>>>>> upstream/master
                 <configuration>
                     <webApp>
                         <contextPath>/front-controller</contextPath>