merge stream.js to app.js