fixing merge issue and sign up error messages