diff --git a/metadata/org.mozilla.firefox_beta.txt b/metadata/org.mozilla.firefox_beta.txt
index ef27c7ba07..23ac460a99 100644
--- a/metadata/org.mozilla.firefox_beta.txt
+++ b/metadata/org.mozilla.firefox_beta.txt
@@ -20,9 +20,5 @@ Warning: the issue tracker link is not mobile-friendly.
 #They come from here: http://ftp.mozilla.org/pub/mozilla.org/mobile/releases/
 Update Check Mode:Market
 Current Version:15.0
-<<<<<<< HEAD
-Current Version Code:2012073115
-=======
 Current Version Code:2012081423
->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e