Added channel/version layer
Sorted merge results test