login fix
merge conflicts