restored app.js
resolved merge conflicts