diff --git a/VERSION b/VERSION
index bc210e9a..1ce50c58 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1,5 @@
+<<<<<<< HEAD
 Version 2.7.4-stable+timestamp.2013.11.07.11.00.04
+=======
+Version 2.7.4-stable+timestamp.2013.11.06.16.56.35
+>>>>>>> 58c22b8ed0c463aed5907d4e7bce025f905d52ed