Fixed a merge conflict

package-lock.json

package.json

public/favicon.ico

src/assets/additem.png

src/assets/members.png

src/assets/messages.png

src/assets/newCommunity.png

src/assets/notifications.png

src/assets/profile.png

src/assets/removeIcon.png

src/components/BaseComponents/ColoredButton.vue

src/components/BaseComponents/CommunityHeader.vue

src/components/BaseComponents/CustomFooterModal.vue

src/components/BaseComponents/IconButton.vue

src/components/BaseComponents/InputField.vue

src/components/BaseComponents/NavBar.vue

src/components/BaseComponents/NotificationModal.vue

src/components/ChatComponents/ChatMessage.vue

src/components/CommunityComponents/CommunityHome.vue

src/components/CommunityComponents/CommunityListItem.vue