Cleaned up merge_stream(), takes empty channels out at the beginning and adds...

Cleaned up merge_stream(), takes empty channels out at the beginning and adds them in before the merge() function