remove/add config options and keep token on logout
conflict fix