Done with user registration form.
Fixed merge conflict