Merge pull request conda#9748 from forrestwaters/fw_conflicts_traceback

account for channel in specs

conda/models/match_spec.py

@@ -500,7 +500,7 @@ def _merge(self, other, union=False):
                 if union:
                     try:
                         final = this_component.union(that_component)
-                    except (AttributeError, ValueError):
+                    except (AttributeError, ValueError, TypeError):
                         final = '%s|%s' % (this_component, that_component)
                 else:
                     final = this_component.merge(that_component)