chore: fix merge conflicts (#24)

client/package-lock.json

client/package.json

client/src/app/app-routing.module.ts

client/src/app/app.component.html

...r-profile-edit-form/user-profile-edit-form.component.html

...r-profile-edit-form/user-profile-edit-form.component.scss

...rofile-edit-form/user-profile-edit-form.component.spec.ts

...ser-profile-edit-form/user-profile-edit-form.component.ts

...nt/src/app/users/user-profile/user-profile.component.html

client/src/app/users/user-profile/user-profile.component.ts

...r-registration-form/user-registration-form.component.html

...egistration-form/user-registration-form.component.spec.ts

client/src/app/users/user.module.ts

client/src/app/users/user.service.ts

server/package.json

server/src/controllers/userController/index.ts