fixed conflict, logout ok