resolve final conflict on app.js