package.json

@@ -2,11 +2,7 @@
   "private": true,
   "name": "lucid-creations-media-potty-chart",
   "homepage": "https://lucidcreations.media/introducing-code-name-potty-chart/",
-<<<<<<< HEAD
   "version": "v0.0.9.0-alpha",
-=======
-  "version": "v0.0.8.1-alpha",
->>>>>>> main
   "author": {
     "name": "Lucid Creations Media",
     "url": "https://lucidcreations.media",

theme/layout/Header.tsx

@@ -15,11 +15,7 @@ import appLogo from "../../public/images/logo.svg";
 
 const Header = (): JSX.Element => {
   const appName = "LCM Potty Chart";
-<<<<<<< HEAD
   const appVersion = "v0.0.9.0-alpha";
-=======
-  const appVersion = "v0.0.8.1-alpha";
->>>>>>> main
 
   // Add transparency while not at the top of the page.
   const [transparentNavbar, setTransparentNavbar] = useState<boolean>(false);