diff --git a/jetty-features/org.eclipse.jetty.all/feature.xml b/jetty-features/org.eclipse.jetty.all/feature.xml
index 46c9ad3..436cc9a 100644
--- a/jetty-features/org.eclipse.jetty.all/feature.xml
+++ b/jetty-features/org.eclipse.jetty.all/feature.xml
@@ -3,7 +3,6 @@
       id="org.eclipse.jetty.all"
       label="%featureName"
       version="8.1.3.qualifier"
->>>>>>> master
       provider-name="%providerName">
 
    <description url="%descriptionURL">
diff --git a/pom.xml b/pom.xml
index 4506ade..397b82a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
         <!--forceContextQualifier>v20110513</forceContextQualifier-->
         <p2-install-folder-name>staging-milestone</p2-install-folder-name>
         <p2-install-parent-folder-name>jetty-rt-3.8milestones</p2-install-parent-folder-name>
-        <equinox-site>http://download.eclipse.org/eclipse/updates/3.8milestones/S-3.8RC2-201205251400</equinox-site>
+        <equinox-site>http://download.eclipse.org/eclipse/updates/4.2-I-builds/I20120605-1900</equinox-site>
         <jetty-bundles-site>http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/8.1.3.v20120522</jetty-bundles-site>
       </properties>
     </profile>