diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh
index 79b0cdace..f4548690c 100755
--- a/scripts/mergeAll.sh
+++ b/scripts/mergeAll.sh
@@ -25,8 +25,12 @@ git merge master
 git checkout microtypography
 git merge ice-cream-sandwich
 
-git checkout filechooser
+git checkout fc
+git merge master
+
+git checkout fc-ics
 git merge ice-cream-sandwich
+git merge fc
 
 git checkout yotabeta
 git merge beta-ics