merge errors from RegistrationForm and SignupForm
fixed conflict