some changes to sign-up.html
resolving conflicts