fix check login
resolve conflict generic.js