login is fixed
fixed merged