diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh
index 09580f5fd..fe66e011e 100755
--- a/scripts/mergeAll.sh
+++ b/scripts/mergeAll.sh
@@ -1,16 +1,16 @@
 #!/bin/sh
 
 git checkout android-1.5
-git merge --no-edit master
+git merge master
 
 git checkout ice-cream-sandwich
-git merge --no-edit master
+git merge master
 
 git checkout beta
-git merge --no-edit master
+git merge master
 
 git checkout beta-ics
-git merge --no-edit beta
-git merge --no-edit ice-cream-sandwich
+git merge beta
+git merge ice-cream-sandwich
 
 git checkout master