Fix Channels Dist
Fix Merge