Fix git merge issues.
diff --git a/releng/org.eclipse.amp.build-feature/buckminster.cspex b/releng/org.eclipse.amp.build-feature/buckminster.cspex
index 3b6c865..83b4080 100644
--- a/releng/org.eclipse.amp.build-feature/buckminster.cspex
+++ b/releng/org.eclipse.amp.build-feature/buckminster.cspex
@@ -93,13 +93,6 @@
 		<cs:public name="build">
 			<cs:attribute name="package.amp-Update" />
  			<cs:attribute name="package.amp-SDK" />
-<<<<<<< HEAD
-		<!--		<cs:attribute name="package.amp-runtime" />
-=======
-	<!--			<cs:attribute name="package.amp-runtime" />
->>>>>>> recovered-2
-		<cs:attribute name="package.amp-Examples" />
-			<cs:attribute name="package.amp-sourcedoc" /> -->
 		</cs:public>
 	</cs:groups>
 </cs:cspecExtension>
diff --git a/releng/org.eclipse.amp.build-feature/feature.xml b/releng/org.eclipse.amp.build-feature/feature.xml
index 6ea5828..d4d1a79 100644
--- a/releng/org.eclipse.amp.build-feature/feature.xml
+++ b/releng/org.eclipse.amp.build-feature/feature.xml
@@ -29,12 +29,7 @@
    <includes
          id="org.eclipse.amp.test"
          version="0.0.0"/>
-<<<<<<< HEAD
-=======
-
-   <includes
+	<includes
          id="org.eclipse.amp.agf3d"
          version="0.0.0"/>
->>>>>>> recovered-2
-
 </feature>
diff --git a/releng/org.eclipse.amp.releng/promoter.ant b/releng/org.eclipse.amp.releng/promoter.ant
index 48d1326..87ab753 100644
--- a/releng/org.eclipse.amp.releng/promoter.ant
+++ b/releng/org.eclipse.amp.releng/promoter.ant
@@ -18,11 +18,8 @@
 			<entry key="eclipse.home" value="${eclipse.home}" />
 			<entry key="build.id" value="${build.id}" />
 			<entry key="hudson.build.id" value="${hudson.build.id}" />
-<<<<<<< HEAD
-=======
 			<entry key="packages.base" value="amp.downloads" />
 			<entry key="downloads.area" value="/home/data/httpd/download.eclipse.org/amp" />
->>>>>>> recovered-2
 		</propertyfile>
 
 		<!-- diagnostics
diff --git a/releng/org.eclipse.amp.releng/publisher.properties b/releng/org.eclipse.amp.releng/publisher.properties
index 3535fec..95e419c 100644
--- a/releng/org.eclipse.amp.releng/publisher.properties
+++ b/releng/org.eclipse.amp.releng/publisher.properties
@@ -1,11 +1,4 @@
-<<<<<<< HEAD
-version=0.8.0
-packages.base=amp.downloads
-tests.base=amp.test.results
-downloads.area=/home/data/httpd/download.eclipse.org/amp/
-=======
 version=0.8.1
 packages.base=amp.downloads
 tests.base=amp.test.results
 downloads.area=/home/data/httpd/download.eclipse.org/amp/
->>>>>>> recovered-2