Resolve conflicts -- Jason, please check that the authentication logic is still good.