diff --git a/Version b/Version
index 527f554f3..37989bd16 100644
--- a/Version
+++ b/Version
@@ -1,5 +1 @@
-<<<<<<< HEAD
 2.10
-=======
-2.9
->>>>>>> 02981fa... add pkglist and template for fedora21 ppc64le