fix login
merge