diff --git a/version b/version
index b00f58787..d1eaa3ba0 100644
--- a/version
+++ b/version
@@ -1,9 +1 @@
-<<<<<<< HEAD
 1.30.2
-=======
-<<<<<<< HEAD
-1.30.0
-=======
-1.29.1
->>>>>>> master
->>>>>>> icon_video