Replace event-stream with merge-stream

Closes #462