houston we have logout
merge errors fixed