Remove merge conflict in app.js

Remove tail conflict in framework/app.js