users can sign up
merge conflicts resolved