Index: conflicts.c
===================================================================
--- conflicts.c	(revision 9347)
+++ conflicts.c	(working copy)
@@ -452,7 +452,7 @@
 
             for (j = constptr->option->num_choices,
 	             cptr = constptr->option->choices;
-		 j > 0;
+		 j > 0 && !changed;
 		 j --, cptr ++)
             {
 	      cupsArrayDelete(test);
@@ -474,7 +474,6 @@
 					    cptr->choice, num_newopts,
 					    &newopts);
 		changed     = 1;
-		break;
 	      }
 	    }
 
@@ -482,13 +481,13 @@
           }
         }
       }
+    }
 
-      if (!changed)
-      {
-	DEBUG_puts("1ppdResolveConflicts: Unable to automatically resolve "
-		   "constraint!");
-	goto error;
-      }
+    if (!changed)
+    {
+      DEBUG_puts("1ppdResolveConflicts: Unable to automatically resolve "
+                 "constraint!");
+      goto error;
     }
 
     cupsArrayClear(pass);