Added user registration functionality
adding stuff i forgot
added conflict resolutions