feature test for users sign up page started
fix merge conflicts