Finish user signup
finished user signup
finished signup
conflict corrected