fix for login
conflict fixed