user sign up
fixed conflicts