Fixed a merge conflict

src/components/BaseComponents/PaginationTemplate.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

...ponents/UserProfileComponents/RatingComponents/Rating.vue

...ts/UserProfileComponents/RatingComponents/RatingModal.vue

...ofileComponents/RentHistoryComponents/RentHistoryItem.vue

src/components/UserProfileComponents/UserItems.vue

src/components/UserProfileComponents/UserListItemCard.vue

src/components/UserProfileComponents/UserProfile.vue

src/router/index.js

src/services/user.service.js

src/utils/apiutil.js

src/views/CommunityViews/CommunityView.vue

src/views/CommunityViews/MyCommunitiesView.vue

src/views/HelpView.vue

src/views/UserProfileViews/MyCommunitiesView.vue