user can sign in, all tests passed.
fix merge conflicts