Sort channels as well.
Fix merge.