all login and logout working
conflict resolved