Added stream-combiner dep
After a lot of work and misunderstanding... is done.
Merged and resolved conflicts