modified login page
fixed conflicts