streamhandlker
conflict fixed