diff --git a/admin-tools/how-to-make-a-release.md b/admin-tools/how-to-make-a-release.md
index 2c9430f0..4d3ecf02 100644
--- a/admin-tools/how-to-make-a-release.md
+++ b/admin-tools/how-to-make-a-release.md
@@ -45,6 +45,8 @@
 
     $ source admin-tools/setup-python-2.4.sh
     $ git merge master
+	# Add and fix merge conflicts
+	$ git commit
 
 # Check against older versions