sign up working
fixed merge conflicts