logout bug to fix
merge