Fixed a merge conflict

src/components/BaseComponents/NavBar.vue

src/components/BaseComponents/RatingModal.vue

src/components/ChatComponents/ChatMessage.vue

src/components/ChatComponents/ChatProfile.vue

src/components/CommunityComponents/CommunityHamburger.vue

src/components/CommunityComponents/CommunityHeader.vue

src/components/CommunityComponents/CommunityHome.vue

src/components/CommunityComponents/CommunityRequestForm.vue

src/components/CommunityComponents/CommunitySettings.vue

src/components/FormComponents/LoginForm.vue

src/components/FormComponents/NewPasswordForm.vue

src/components/FormComponents/ResetPasswordForm.vue

src/components/ItemComponents/NewItemForm.vue

src/components/RentingComponents/ItemInfo.vue

src/components/RentingComponents/NewRent.vue

...ts/TimepickerComponents/DatepickerRange/MonthSelector.vue

src/components/UserProfileComponents/UserItems.vue

src/components/UserProfileComponents/UserListItemCard.vue

src/components/UserProfileComponents/UserProfile.vue

src/main.js