conflict resolved for app.js