diff --git a/stats/known_apks.txt b/stats/known_apks.txt
index dd2b9c8e94..e5bd8b801b 100644
--- a/stats/known_apks.txt
+++ b/stats/known_apks.txt
@@ -310,15 +310,7 @@ com.jakebasile.android.hearingsaver_12.apk com.jakebasile.android.hearingsaver 2
 com.jecelyin.editor_32.apk com.jecelyin.editor 2012-08-23
 com.jlyr_1.apk com.jlyr 2012-08-23
 com.jotabout.screeninfo.Screeninfo_103.apk com.jotabout.screeninfo 2012-07-05
-<<<<<<< HEAD
-<<<<<<< HEAD
 com.kkinder.sharelocation_141.apk com.kkinder.sharelocation 2012-08-23
-=======
-com.kibab.android.EncPassChanger_1.apk com.kibab.android.EncPassChanger 2012-08-23
->>>>>>> 10de0ecfdafb99b6abe752bf2c3efcbb7dfaab57
-=======
-com.kkinder.sharelocation_141.apk com.kkinder.sharelocation 2012-08-23
->>>>>>> abf4fd70155c2d870e029171d4714a16586f4624
 com.kmagic.solitaire_450.apk com.kmagic.solitaire 2011-01-23
 com.kostmo.wallpaper.spiral_12.apk com.kostmo.wallpaper.spiral 2012-03-23
 com.kostmo.wallpaper.spiral_13.apk com.kostmo.wallpaper.spiral 2012-08-23
@@ -551,15 +543,7 @@ me.guillaumin.android.osmtracker_20.apk me.guillaumin.android.osmtracker 2011-07
 me.guillaumin.android.osmtracker_21.apk me.guillaumin.android.osmtracker 2011-10-02
 me.guillaumin.android.osmtracker_22.apk me.guillaumin.android.osmtracker 2012-02-05
 me.guillaumin.android.osmtracker_23.apk me.guillaumin.android.osmtracker 2012-08-23
-<<<<<<< HEAD
-<<<<<<< HEAD
 me.kuehle.carreport_8.apk me.kuehle.carreport 2012-08-23
-=======
-me.guillaumin.android.osmtracker_26.apk me.guillaumin.android.osmtracker 2012-08-23
->>>>>>> 10de0ecfdafb99b6abe752bf2c3efcbb7dfaab57
-=======
-me.kuehle.carreport_8.apk me.kuehle.carreport 2012-08-23
->>>>>>> abf4fd70155c2d870e029171d4714a16586f4624
 mixare-0061.apk org.mixare
 mixare-0062.apk org.mixare
 mixare-0063.apk org.mixare