added sign up form (not working)
fix conflict