Fixed a merge conflict

.gitlab-ci.yml

package-lock.json

package.json

src/components/CommunityComponents/CommunityHome.vue

src/components/FormComponents/NewPasswordForm.vue

src/components/FormComponents/ResetPasswordForm.vue

src/components/ItemComponents/ItemCard.vue

src/components/ItemComponents/NewItemForm.vue

src/components/RentingComponents/ImageCarousel.vue

src/components/RentingComponents/ItemInfo.vue

src/components/RentingComponents/NewRent.vue

...imepickerComponents/DatepickerRange/CalendarComponent.vue

.../TimepickerComponents/DatepickerRange/DatepickerRange.vue

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

src/components/UserProfileComponents/UserListItemCard.vue

src/router/index.js

src/utils/apiutil.js

src/views/RentingViews/ItemInfoPageView.vue

tailwind.config.js

tests/unit/apiutil-communityHome-mock.spec.js