add user signup page and routes
fix merge conflict