diff --git a/README.md b/README.md
index f3b3bfd795..442ced7ccc 100644
--- a/README.md
+++ b/README.md
@@ -298,7 +298,6 @@ run:
 
 If you have any questions we're in #docker-machine on Freenode.
 
-=======
 ## Integration Tests
 There is a suite of integration tests that will run for the drivers.  In order
 to use these you must export the corresponding environment variables for each
diff --git a/ROADMAP.md b/ROADMAP.md
index 5bd1d761b2..b620b2b815 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,15 +1,13 @@
-Roadmap
-=======
+# Roadmap
 
-Machine 1.0
------------
+
+## Machine 1.0
 
 This will be a stable version of the current design with additional drivers and complete documentation.
 
 You can follow progress towards this release with the [GitHub milestone](https://github.com/docker/machine/milestones/1.0).
 
-Future
-------
+## Future
 
 There are two main areas for future development:
 
diff --git a/script/validate-git-marks b/script/validate-git-marks
new file mode 100755
index 0000000000..24f048425d
--- /dev/null
+++ b/script/validate-git-marks
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+IN_MARK=$(grep -r "^<<<<<<<" *)
+if [ $? -eq 0 ]; then
+	echo "-- Git conflict marks have been found, please correct them :"
+	echo "$IN_MARK"
+	exit 1
+fi
+
+OUT_MARK=$(grep -r "^>>>>>>>" *)
+if [ $? -eq 0 ]; then
+	echo "-- Git conflict marks have been found, please correct them :"
+	echo "$OUT_MARK"
+	exit 1
+fi
+
+SEPARATE_MARK=$(grep -r "^=======$" *)
+if [ $? -eq 0 ]; then
+	echo "-- Git conflict marks have been found, please correct them :"
+	echo "$SEPARATE_MARK"
+	exit 1
+fi
+
+echo "-- Congratulations : no git conflict marks have been found !"