Modified user sign up form to hide field
Fixed merge conflicts