fixed merge channels
Merge pull request #432 from rajatkapoor/merge_channels

fixed merge channels