Creation of user with angular
Fixed merge conflicts