fixes the stream
resolves conflicts with myself