diff --git a/VERSION b/VERSION
index 4366851..66f274e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1.5.138
-=======
 1.5.139
->>>>>>> master