diff --git a/version.txt b/version.txt
index 11752b9..3b78c19 100644
--- a/version.txt
+++ b/version.txt
@@ -1,3 +1,8 @@
 APPLICATION_ID=org.askartv.tv
+<<<<<<< HEAD
 VERSION_NAME=v0.2.8
 VERSION_CODE=14
+=======
+VERSION_NAME=0.2.7a
+VERSION_CODE=13
+>>>>>>> parent of 8343fab (semantically fix version.txt for automatic bumps)