sign up success
fixed merge conflicts