Bug 514544 - Remove merge indicators from New and Noteworthy page

Signed-off-by: Eric Poirier <eric.poirier@eclipse-foundation.org>
diff --git a/noteworthy/noteworthy.html b/noteworthy/noteworthy.html
index 279f1b4..96178c7 100644
--- a/noteworthy/noteworthy.html
+++ b/noteworthy/noteworthy.html
@@ -1021,14 +1021,10 @@
 <div class="sect3">
 <h4 id="support-for-building-java-9-applications"><a class="anchor" href="#support-for-building-java-9-applications"></a>Support for Building Java 9 Applications</h4>
 <div class="paragraph">
-<<<<<<< HEAD
-<p>The Java™ 9 specification has not been released yet and so support has not yet been integrated into our standard download packages. You can add an early access preview to your existing Eclipse IDE, Oxygen Edition (4.7) install. The Eclipse Java™ 9 Support (BETA) contains the following:</p>
-=======
 <p>The Java™ 9 specification has not been released yet and so support has not yet been integrated into our standard download packages. You can add an early access preview to the Eclipse IDE, Oxygen Edition (4.7).</p>
 </div>
 <div class="paragraph">
 <p>The Eclipse Java™ 9 Support (BETA) contains the following:</p>
->>>>>>> 5e46d70
 </div>
 <div class="ulist">
 <ul>
@@ -1064,13 +1060,6 @@
 <p>For up-to-date information, please see <a href="https://marketplace.eclipse.org/content/java-9-support-beta-oxygen">Java 9 Support (BETA) for Oxygen</a> in the Eclipse Marketplace.</p>
 </div>
 <div class="paragraph">
-<<<<<<< HEAD
-<p>Or, install the beta by dragging the install button onto your running Eclipse IDE, Oxygen Edition instance.</p>
-</div>
-<a href="http://marketplace.eclipse.org/marketplace-client-intro?mpc_install=2393593" class="drag" title="Drag to your running Eclipse* workspace. *Requires Eclipse Marketplace Client"><img class="img-responsive" src="https://marketplace.eclipse.org/sites/all/themes/solstice/public/images/marketplace/btn-install.png" alt="Drag to your running Eclipse* workspace. *Requires Eclipse Marketplace Client" /></a>
-</div>
-</div>
-=======
 <p>Install the beta by dragging the install button onto your running Eclipse IDE, Oxygen Edition instance.</p>
 </div>
 <div style="text-align:center">
@@ -1078,7 +1067,6 @@
 </div>
 </div>
 </div>
->>>>>>> 5e46d70
 <div class="sect2">
 <h3 id="jdt-java-editor"><a class="anchor" href="#jdt-java-editor"></a>Java Editor</h3>
 <div class="sect3">