diff --git a/TTS/VERSION b/TTS/VERSION
index dd5bb95b..5eef0f10 100644
--- a/TTS/VERSION
+++ b/TTS/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-0.10.1
-=======
 0.10.2
->>>>>>> dev