removed app.js.conflict, not needed.