diff --git a/include/build_timestamp.h b/include/build_timestamp.h
index 0697aac5a..7b6c3b098 100644
--- a/include/build_timestamp.h
+++ b/include/build_timestamp.h
@@ -1,3 +1,3 @@
 /*auto-generated*/
-#define UPDATED_STR "May 3, 2018 6:49:33pm"
+#define UPDATED_STR "May 3, 2018 6:53:44pm"
 #define COPYRIGHT_END_YEAR "2018"
diff --git a/merge-dev-to-master.sh b/merge-dev-to-master.sh
index 65099cabb..49560b269 100755
--- a/merge-dev-to-master.sh
+++ b/merge-dev-to-master.sh
@@ -6,8 +6,14 @@ git checkout develop
 git pull
 git push
 
+rm -f include/build_timestamp.h
+git checkout include/build_timestamp.h
+
 git checkout master
 git pull
 git push
 
+rm -f include/build_timestamp.h
+git checkout include/build_timestamp.h
+
 git checkout master && git merge develop && git checkout develop && git merge master && git fetch --all && git push --all && make -j