new user signup working nicely
fixing merge conflicts