Merge "Quick: Fix a DCHECK to take type conflicts into account."