merge of app.js into app.ts