Resolveld conflict on app.js