logout fix
merge confilct