fixing conflict marker
fixing stream abstraction. now IPC channel sends properly pause when
buffering