Working on user registration
Fixed merge conflicts