diff --git a/metadata/android.game.prboom.txt b/metadata/android.game.prboom.txt
index f76beedc48..f89717feaa 100644
--- a/metadata/android.game.prboom.txt
+++ b/metadata/android.game.prboom.txt
@@ -25,11 +25,7 @@ Repo:http://prboom4android.googlecode.com/svn/trunk/
 
 Build Version:1.3.1-beta,31,49,buildjni=yes
 
-<<<<<<< HEAD
 #not in market
 Update Check Mode:None
 Current Version:1.3.1-beta
 Current Version Code:31
-=======
-Update Check Mode:Market
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
diff --git a/metadata/com.android.keepass.txt b/metadata/com.android.keepass.txt
index a12dbf15e4..135b03cd54 100644
--- a/metadata/com.android.keepass.txt
+++ b/metadata/com.android.keepass.txt
@@ -26,11 +26,8 @@ Build Version:1.9.8,85,v1.9.8,target=android-8
 
 #Temporarily disabled - need MIPS version of NDK I think
 #Build Version:1.9.9,86,v1.9.9,target=android-8,buildjni=yes
-<<<<<<< HEAD
 #Build Version:1.9.14,91,v1.9.14,target=android-8,buildjni=yes
 
-=======
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
 Update Check Mode:Market
 Current Version:1.9.14
 Current Version Code:91
diff --git a/metadata/com.axelby.podax.txt b/metadata/com.axelby.podax.txt
index 7802d89c02..67b33506b9 100644
--- a/metadata/com.axelby.podax.txt
+++ b/metadata/com.axelby.podax.txt
@@ -33,11 +33,6 @@ Build Version:4.03,22,!151b8d508b3 submodules still invalid - Clone of 'git://gi
 #Build Version:4.3,25,c44247910375d9660ebcdfda91c1c7b25586579b
 
 Update Check Mode:RepoManifest
-<<<<<<< HEAD
-Current Version:4.3
-Current Version Code:25
-=======
 Current Version:4.5
 Current Version Code:28
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
 
diff --git a/metadata/com.bwx.bequick.txt b/metadata/com.bwx.bequick.txt
index 00f9586cbc..c446b3c134 100644
--- a/metadata/com.bwx.bequick.txt
+++ b/metadata/com.bwx.bequick.txt
@@ -19,11 +19,7 @@ Build Version:1.9.9.2,201106160,213,target=android-8
 Build Version:1.9.9.3,201107260,220,target=android-8
 Build Version:1.9.9.7,201202290,!Source has disappeared
 
-<<<<<<< HEAD
 Update Check Mode:None
-=======
-Update Check Mode:Market
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
 Current Version:1.9.10
 Current Version Code:201207300
 
diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt
index 9afbfc3910..5364b69978 100644
--- a/metadata/com.fsck.k9.txt
+++ b/metadata/com.fsck.k9.txt
@@ -18,15 +18,9 @@ Repo Type:git
 Repo:https://github.com/k9mail/k-9.git
 
 #Build Version:3.906,14006,3.906,oldsdkloc=yes,patch=target9to10.patch,target=android-10
-<<<<<<< HEAD
 Build Version:4.301,17001,5b4d2806
 
-Update Check Mode:RepoManifest
-Current Version:4.301
-Current Version Code:17001
-=======
 Update Check Mode:Market
 Current Version:4.011
 Current Version Code:14029
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
 
diff --git a/metadata/com.owncloud.android.txt b/metadata/com.owncloud.android.txt
index 9dd6597198..37218cdba7 100644
--- a/metadata/com.owncloud.android.txt
+++ b/metadata/com.owncloud.android.txt
@@ -17,11 +17,6 @@ Repo:git://gitorious.org/owncloud/android-devel.git
 Build Version:1.3.1,103001,239be8fb4f,submodules=yes,prebuild=android update project -p actionbarsherlock/library
 
 Update Check Mode:RepoManifest
-<<<<<<< HEAD
-Current Version:1.3.4
-Current Version Code:103004
-=======
 Current Version:1.3.6
 Current Version Code:103006
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
 
diff --git a/metadata/com.showmehills.txt b/metadata/com.showmehills.txt
index 5f918f000e..f6b6cf2126 100644
--- a/metadata/com.showmehills.txt
+++ b/metadata/com.showmehills.txt
@@ -25,11 +25,6 @@ echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties
 #Note that 0.17 will either need acra.disabled patching to be true by default, or
 #the appropriate AntiFeature flag adding.
 Update Check Mode:Market
-<<<<<<< HEAD
-Current Version:0.15
-Current Version Code:15
-=======
 Current Version:0.20
 Current Version Code:20
 
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
diff --git a/metadata/com.zoffcc.applications.zanavi.txt b/metadata/com.zoffcc.applications.zanavi.txt
index 27fa939d75..059d8e4239 100644
--- a/metadata/com.zoffcc.applications.zanavi.txt
+++ b/metadata/com.zoffcc.applications.zanavi.txt
@@ -25,13 +25,8 @@ Repo Type:git-svn
 Repo:http://zanavi.cc/zanavi_public1/navit
 
 Update Check Mode:Market
-<<<<<<< HEAD
-Current Version:1.0.53
-Current Version Code:53
-=======
 Current Version:2.0.0
 Current Version Code:200
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
 
 #......
 #Build Version:1.0.52
diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt
index 798eecef39..ecbcf97ec3 100644
--- a/metadata/de.schildbach.wallet_test.txt
+++ b/metadata/de.schildbach.wallet_test.txt
@@ -43,11 +43,6 @@ mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v
 Build Version:2.20_test,91,197963d9a457 ## new version of BitcoinJWallet. 
 
 Update Check Mode:RepoManifest
-<<<<<<< HEAD
-Current Version:2.20_test
-Current Version Code:91
-=======
 Current Version:2.21_test
 Current Version Code:92
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
 
diff --git a/metadata/jp.sblo.pandora.jota.txt b/metadata/jp.sblo.pandora.jota.txt
index 62ffabada9..a31feb0772 100644
--- a/metadata/jp.sblo.pandora.jota.txt
+++ b/metadata/jp.sblo.pandora.jota.txt
@@ -19,11 +19,6 @@ Build Version:0.2.07,57,86,buildjni=yes,target=android-11
 Build Version:0.2.13,63,113,buildjni=yes,target=android-11
 
 Update Check Mode:Market
-<<<<<<< HEAD
-Current Version:0.2.19
-Current Version Code:69
-=======
 Current Version:0.2.26
 Current Version Code:76
 
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
diff --git a/metadata/me.guillaumin.android.osmtracker.txt b/metadata/me.guillaumin.android.osmtracker.txt
index 02093619a0..22fc873123 100644
--- a/metadata/me.guillaumin.android.osmtracker.txt
+++ b/metadata/me.guillaumin.android.osmtracker.txt
@@ -19,14 +19,9 @@ Repo:https://github.com/nguillaumin/osmtracker-android.git
 
 Build Version:0.5.6,21,0.5.6,target=android-8
 Build Version:0.5.7,22,eac27c8a37066988f784cbc2ad7e7a2ab0326839,target=android-8
-Build Version:0.5.8,23,623453d4f0,target=android-8
+Build Version:0.6.2,26,0.6.2,target=android-15
 
 Update Check Mode:Market
-<<<<<<< HEAD
-Current Version:0.5.8
-Current Version Code:23
-=======
 Current Version:0.6.2
 Current Version Code:26
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
 
diff --git a/metadata/org.eehouse.android.xw4.txt b/metadata/org.eehouse.android.xw4.txt
index d23a9e1bd1..d89f4b8330 100644
--- a/metadata/org.eehouse.android.xw4.txt
+++ b/metadata/org.eehouse.android.xw4.txt
@@ -23,9 +23,5 @@ Build Version:4.4 beta 39,31,android_beta_39,subdir=xwords4/android/XWords4,buil
 
 Update Check Mode:Market
 Current Version:4.4
-<<<<<<< HEAD
-Current Version Code:40
-=======
 Current Version Code:42
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
 
diff --git a/metadata/org.wahtod.wififixer.txt b/metadata/org.wahtod.wififixer.txt
index ebff0e3157..9459a4d677 100644
--- a/metadata/org.wahtod.wififixer.txt
+++ b/metadata/org.wahtod.wififixer.txt
@@ -25,11 +25,6 @@ Build Version:0.9.0.2,922,b354e4538bf242f10125af49050e36126b668972,subdir=wififi
 Build Version:0.9.5,952,4d6dda4c9aa283c162fd1d4c3edaeb8c0d6d8a32,subdir=wififixer,target=android-15
 
 Update Check Mode:Market
-<<<<<<< HEAD
-Current Version:0.9.5
-Current Version Code:952
-=======
 Current Version:0.9.5.1
 Current Version Code:955
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e
 
diff --git a/metadata/org.wordpress.android.txt b/metadata/org.wordpress.android.txt
index 6a03c802fc..6844612c3f 100644
--- a/metadata/org.wordpress.android.txt
+++ b/metadata/org.wordpress.android.txt
@@ -27,11 +27,6 @@ Build Version:2.1.5,56,780,subdir=tags/2.1.5,encoding=utf-8,\
 prebuild=rm ../1.4.0/bin/wp-android.apk && rm ../2.0.3/bin/wp-android.apk && rm ../1.4.1/bin/wp-android.apk && rm ../2.0/bin/wp-android.apk
 
 Update Check Mode:Market
-<<<<<<< HEAD
-Current Version:2.1.4
-Current Version Code:53
-=======
 Current Version:2.1.5
 Current Version Code:56
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e