admin login to home redirecting
merge conflict in app.js