diff --git a/Version b/Version
index 9727b07..840a153 100644
--- a/Version
+++ b/Version
@@ -1,5 +1 @@
-<<<<<<< HEAD
-v 3.1 (200609) (Final)
-=======
 v 3.2 (200802) (Final)
->>>>>>> develop