diff --git a/version b/version
index d230fb9ee..34aae156b 100644
--- a/version
+++ b/version
@@ -1,5 +1 @@
-<<<<<<< HEAD
 1.31.0
-=======
-1.30.4
->>>>>>> master