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