fix merge conflicts

README.md

package.json

src/App.tsx

src/assets/data_visualization.jpeg

src/components/goBack/goBackButton.module.css

src/pages/commitGraphPage/commitPage.module.css

src/pages/commitGraphPage/commitPage.tsx

src/pages/commitListPage/commitListPage.module.css

src/pages/commitListPage/commitListPage.tsx

src/pages/commitListPage/commitPageWrapper.tsx

src/pages/landingPage/landingPage.module.css

src/pages/landingPage/landingPage.tsx

src/pages/overviewPage/overview.tsx

src/test/snapshot.test.tsx

src/utils/victory/useVictory.tsx

yarn.lock