Log out should be working
Fixed conflict