Resolve merge conflict

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github: [cassidoo]
+patreon: cassidoo
+custom: ['https://paypal.me/cassidoo', 'https://venmo.com/cassidoo']

README.md

@@ -4,6 +4,8 @@
 
 Hello, welcome. This is a blog ("blahg" is the proper spelling for Chicagoans) template. It's built with [Astro](https://astro.build), and uses [TinaCMS](https://tina.io) to edit the content!
 
+![cover](https://github.com/cassidoo/blahg/assets/1454517/b56ff04f-9499-48e7-be62-d9b422c4287d)
+
 ## See the blahg
 
 [blahg.netlify.app](https://blahg.netlify.app/)

src/pages/posts.astro

@@ -41,9 +41,8 @@ posts = posts.sort(
 					subscribe with RSS!
 				</a>
 			</p>
-
-			<Footer />
 		</main>
+		<Footer />
 		<ColorScript />
 	</body>
 </html>

src/posts/markdown-example.md

@@ -51,8 +51,6 @@ V franzen umami hammock scenester retro VHS, pop-up truffaut tacos polaroid heir
 
 **bold** _italic_
 **_bold and italic_**
-~~strikethrough~~
-==highlighted text==
 
 ```js
 // This is an example of some React