Fixed a merge conflict

src/components/BaseComponents/LoaderSpinner.vue

src/components/CommunityComponents/CommunityHamburger.vue

src/components/CommunityComponents/CommunityHeader.vue

src/components/CommunityComponents/CommunityHome.vue

src/components/CommunityComponents/CommunityList.vue

src/components/CommunityComponents/CommunityListItem.vue

src/components/CommunityComponents/NewCommunityForm.vue

src/components/FormComponents/LoginForm.vue

src/components/FormComponents/NewPasswordForm.vue

src/components/FormComponents/RegisterForm.vue

src/components/FormComponents/ResetPasswordForm.vue

src/components/ItemComponents/NewItemForm.vue

src/views/CommunityViews/CommunityView.vue

src/views/UserProfileViews/MyCommunitiesView.vue

...mponent-tests/__snapshots__/community-header.spec.js.snap

...nent-tests/__snapshots__/community-list-item.spec.js.snap

...mponent-tests/__snapshots__/create-new-group.spec.js.snap

...-component-tests/__snapshots__/new-item-form.spec.js.snap

...ser-component-tests/__snapshots__/login-form.spec.js.snap