Fix merge conflicts

Author: clytaemnestra

src/content/pages/thank-you.mdx

@@ -291,17 +291,11 @@ Big thanks to **Raquel Dou**,  **Piotr Gnus** and **Anežka Müller** for A/V co
 ## Onsite Volunteers Team
 
 Once you enter the conference, the first what you see are people in yellow t-shirts. They're our volunteers, who assist attendees, chair sessions, and hand out materials.
-<<<<<<< HEAD
-Big thanks to Jake Balaš, Liberta Gani and Mahe Iram Khan for managing everything related to them.
-
-Onsite volunteers:
-=======
 
 Big thanks to **Jake Balaš**, **Liberta Gani** and **Mahe Iram Khan** for managing everything related to them.
 
 Onsite volunteers:
 
->>>>>>> 94d0b269 (Small UI fixes)
 - Agata Leszczak
 - Aleksandra Golofaeva
 - Aleksandr Salynskii