post-merge fix for content/community/conferences

src/content/community/conferences.md

@@ -11,10 +11,7 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
 ## Upcoming Conferences {/*upcoming-conferences*/}
 
 ### React Summit 2024 {/*react-summit-2024*/}
-<<<<<<< HEAD
 
-=======
->>>>>>> 5d2f7105bd6374e465b8bdce8efceaeb8f01c937
 June 14 & 18, 2024. In-person in Amsterdam, Netherlands + remote (hybrid event)
 
 [Website](https://reactsummit.com/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/)
@@ -32,6 +29,7 @@ April 19 - 20, 2024. In-person in Miami, FL, USA
 [Website](https://reactmiami.com/) - [Twitter](https://twitter.com/ReactMiamiConf)
 
 ### Epic Web Conf 2024 {/*epic-web-2024*/}
+
 April 10 - 11, 2024. In-person in Park City, UT, USA
 
 [Website](https://www.epicweb.dev/conf) - [YouTube](https://www.youtube.com/@EpicWebDev)