changes to login
merge