fix conflict loginService