fix logout button
merge conflict