i think this is how you resolve conflicts idk

src/i18n/_global.json

@@ -14,9 +14,6 @@
 	"MIDOU_MATRIX_URL": "https://matrix.to/#/@midou:projectsegfau.lt/",
 	"MRLERIEN": "MrLeRien",
 	"MRLERIEN_DISCORD_URL": "https://discord.com/users/213634643327582208/",
-	"ODYSSEY": "Odyssey",
-	"ODYSSEY_MATRIX_URL": "https://matrix.to/#/@odyssey346:ohai.su/",
-	"ODYSSEY_DISCORD_URL": "https://discord.com/users/315843700490240002/",
 	"DEVNOL": "Devnol",
 	"DEVNOL_MATRIX_URL": "https://matrix.to/#/@devnol:projectsegfau.lt/",
 	"DEVNOL_DISCORD_URL": "https://discordapp.com/users/429353559566319626/",

src/i18n/common.json

@@ -5,9 +5,9 @@
 	"NAVBAR_CONTACT": "Contact",
 	"NAVBAR_BLOG": "Blog",
 	"FOOTER_COPYRIGHT": "© 2021 - present, Project Segfault",
-	"INDEX_DESCRIPTION": "4 idiots, a Sun server and a Hitachi Compute Rack.",
+	"INDEX_DESCRIPTION": "3 idiots, a Sun server and a Hitachi Compute Rack.",
 	"INDEX_WHAT": "What is this?",
-	"INDEX_WHO_ARE_WE": "We are 4 teenagers who have a decently powerful server. What do we do with this server? Host game servers and random assortment of privacy respecting tools like Invidious, Nextcloud, Matrix etc.... and maybe some original works. You'll see eventually!",
+	"INDEX_WHO_ARE_WE": "We are 3 teenagers who have a decently powerful server. What do we do with this server? Host game servers and random assortment of privacy respecting tools like Invidious, Nextcloud, Matrix etc.... and maybe some original works. You'll see eventually!",
 	"INDEX_TELL_ME_MORE": "Tell me more! What do you guys host? Where can I contact you? Can you fix my daughter's iPad?",
 	"INDEX_MORE_INFO": "We can't fix your daughter's iPad, but there is a navigation bar at the top of the page with links to websites and pages that explain things about us, or contain useful information about our services.",
 	"DONATE_TITLE": "Donate to Project Segfault",

src/i18n/fr.json

@@ -5,9 +5,9 @@
 	"NAVBAR_CONTACT": "Contact",
 	"NAVBAR_BLOG": "Blog",
 	"FOOTER_COPYRIGHT": "© 2021 - présent, Project Segfault",
-	"INDEX_DESCRIPTION": "4 idiots, un server Sun et un server Hitachi",
+	"INDEX_DESCRIPTION": "3 idiots, un server Sun et un server Hitachi",
 	"INDEX_WHAT": "Hein?",
-	"INDEX_WHO_ARE_WE": "On est 4 ados qui on un Server assez puissant. Mais on fait quoi de ce server? Eh bien on héberge des servers pour jeu et quelque service qui aident à mieux protéger sa vie privée comme Invidious, Nextcloud, Matrix et etc... et peut être on finira par faire un VRAI projet unique. Ça arrivera patientez!",
+	"INDEX_WHO_ARE_WE": "On est 3 ados qui on un Server assez puissant. Mais on fait quoi de ce server? Eh bien on héberge des servers pour jeu et quelque service qui aident à mieux protéger sa vie privée comme Invidious, Nextcloud, Matrix et etc... et peut être on finira par faire un VRAI projet unique. Ça arrivera patientez!",
 	"INDEX_TELL_ME_MORE": "Hé, je veux plus de détails! Je veux savoir ce que vous hébergez et ce que vous faites!",
 	"INDEX_MORE_INFO": "Il y'a une barre en haut de la page avec des boutons dessus, j'espère que vous n'avez pas de problème de vision!",
 	"DONATE_TITLE": "Faire un don à Project Segfault",

src/i18n/nb.json

@@ -4,9 +4,15 @@
 	"NAVBAR_FAQ": "OSS",
 	"NAVBAR_CONTACT": "Kontakt",
 	"NAVBAR_BLOG": "Blogg",
+<<<<<<< Updated upstream
 	"INDEX_DESCRIPTION": "4 idioter, en Sun server og en Hitachi Compute Rack.",
 	"INDEX_WHAT": "Hva?",
 	"INDEX_WHO_ARE_WE": "Vi er 4 tenåringer med en grei server. Hva gjør vi med denne serveren? Vi ofrer tjenester som respekterer personvernet ditt som for eksempel Invidious, Matrix, Pleroma. Vi kjører også noen spillservere på serveren våres, for eksempel Minecraft. Kanskje vi lager noe originalt... det får du se etterhvert!",
+=======
+	"INDEX_DESCRIPTION": "3 idioter, en Sun server og en Hitachi Compute Rack.",
+	"INDEX_WHAT": "hva",
+	"INDEX_WHO_ARE_WE": "Vi er 3 tenåringer med en grei server. Hva gjør vi med denne serveren? Vi ofrer tjenester som respekterer personvernet ditt som for eksempel Invidious, Matrix, Pleroma. Vi kjører også noen spillservere på serveren våres, for eksempel Minecraft. Kanskje vi lager noe originalt... det får du se etterhvert!",
+>>>>>>> Stashed changes
 	"INDEX_TELL_ME_MORE": "Fortell meg mer! Hva kjører dere på serverene deres? Hvor kan jeg komme i kontakt med dere? Kan dere fikse min datters iPad?",
 	"INDEX_MORE_INFO": "Vi kan ikke fikse din datters iPad, men det er navigasjonslinje på toppen av siden som har lenker til sider som forklarer ting om oss, eller har nyttig informasjon om oss.",
 	"DONATE_TITLE": "Doner til Project Segfault",

src/routes/contact.svelte

@@ -29,13 +29,6 @@
 			>Discord</a
 		>
 		<div class="div6" />
-		<div class="div7">{global.ODYSSEY}:</div>
-		<a class="div8 matrixcolored" href={global.ODYSSEY_MATRIX_URL}
-			>[Matrix]</a
-		>
-		<a class="div9 discordcolored" href={global.ODYSSEY_DISCORD_URL}
-			>Discord</a
-		>
 		<div class="div10">{global.DEVNOL}:</div>
 		<a class="div11 matrixcolored" href={global.DEVNOL_MATRIX_URL}
 			>[Matrix]</a