fixed bug
fixed sign up
resolve merge conflict