fix issue : logout is not called on conflict