Fixed a merge conflict

package-lock.json

package.json

src/components/BaseComponents/IconButton.vue

src/components/BaseComponents/NavBar.vue

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

src/components/CommunityComponents/CommunityListItem.vue

src/components/CommunityComponents/CommunityRequestForm.vue

src/components/CommunityComponents/CommunitySettings.vue

src/components/CommunityComponents/MemberList.vue

src/components/FormComponents/LoginForm.vue

src/components/FormComponents/NewPasswordForm.vue

src/components/FormComponents/ResetPasswordForm.vue

src/components/ItemComponents/NewItemForm.vue

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