fix bug auto logout
fix conflict