resolve conflicts

src/slides/compsoc/6_minecraft-onboarding.md

@@ -10,7 +10,7 @@ slides = true
 
 we got a quite a bit of server power here at Skynet
 
-(insert image of our servers)
+![Computer Society server](6_minecraft-onboarding/skynet-server.jpeg)
 
 ------------------------------------------------------------
 
@@ -37,7 +37,7 @@ or you can find it on the society's page on the UL Wolves website
 
 ### and finally!! you need to link your Minecraft account like this
 
-<img src="6_minecraft-onboarding/link-minecraft.png" alt="link minecraft account" width="300px"></a>
+<img src="6_minecraft-onboarding/link-minecraft.png" alt="link minecraft account" width="300px" height="23px">
 
 (you can use the ``#bot-commands`` channel to not spam everyone)
 
@@ -49,7 +49,7 @@ or you can find it on the society's page on the UL Wolves website
 
 ### we actually got 2 servers you can play on!
 
---------------------------------------------------------------------------
+-------------------------------------------------------------------------------
 
 ## first one is a vanilla 1.20.4 server, but you can join from most versions past and future even though not all features might work
 
@@ -59,15 +59,13 @@ the address of the server is **minecraft.compsoc.games.skynet.ie**
 
 if you want to join from bedrock edition: ip is **193.1.99.91** and the port is **19132**
 
---------------------------------------------------------------------------
+-------------------------------------------------------------------------------
 
-### for this server i made a modpack
-## that enhances the multiplayer experience a bit
-## nothing big AND you DON'T NEED to have it to play 
+### for this server i made a modpack that enhances the multiplayer experience a bit nothing big AND you DON'T NEED to have it to play
 
 you can find it on [Modrinth.com](www.modrinth.com) and search for [CompSoc Vanilla Enhanced](https://modrinth.com/modpack/compsoc-vanilla-enhanced) (or click the links here)
 
---------------------------------------------------------------------------
+-------------------------------------------------------------------------------
 
 ## second server is using the Aged modpack version 2.2.2