diff --git a/gclient.py b/gclient.py
index 389275afb..b3de242f0 100755
--- a/gclient.py
+++ b/gclient.py
@@ -2771,6 +2771,10 @@ def CMDsync(parser, args):
     slns = {}
     for d in client.subtree(True):
       normed = d.name.replace('\\', '/').rstrip('/') + '/'
+      if normed in slns and not d.should_process:
+        # If an unprocessed dependency would override an existing dependency,
+        # ignore it.
+        continue
       slns[normed] = {
           'revision': d.got_revision,
           'scm': d.used_scm.name if d.used_scm else None,
diff --git a/recipes/trigger_recipe_roller.txt b/recipes/trigger_recipe_roller.txt
index e0e14083d..85a7ead01 100644
--- a/recipes/trigger_recipe_roller.txt
+++ b/recipes/trigger_recipe_roller.txt
@@ -5,4 +5,4 @@ Once upon a time, a budding web browser dev team needed a CI system.
 All they had was one poor machine under a desk, and its name was Batty,
 the Build and Test Yeti.
 
-The End
+As the CI needs of the browser grew,