changing authentication
credentials updated, secure login
merge conflict