fixed login page
fixed conflict