Fix Merge Conflicts

package-lock.json

package.json

src/Components/AboutResource.js

src/Components/AcessibilityBar.js

src/Components/ActivityListItem.js

src/Components/AreasSubPages.js

src/Components/Button.js

src/Components/Card.js

src/Components/ColCardPublicOptions.js

src/Components/CollectionCardFunction.js

src/Components/CollectionCommentSection.js

src/Components/CollectionReview.js

src/Components/Coment.js

src/Components/Comment.js

src/Components/ContactButtons/FollowButton.js

src/Components/ContactButtons/FollowingButton.js

src/Components/ContactCard.js

src/Components/ContactCardOptions.js

src/Components/ContactForm.js

src/Components/CriarColecaoForm.js