I dont actually know why a merge was neccicary here both hosts said they were up to date

.ssh/config

@@ -24,29 +24,39 @@ Host zinc
     HostName 10.85.3.120
     User joe
 
-# 1721's main NAS
-Host flattoaster
-    HostName 10.17.21.10
-    User root
-
 # APRS 
 Host APRS
     HostName 10.85.3.39
     User root
 
-# SSH for other services
-Host gitlab.com
-    IdentityFile ~/.ssh/gitlab
-    UpdateHostKeys no
 
-Host aur.archlinux.org
+# Robotics
-    IdentityFile ~/.ssh/aur
+# 1721's main NAS
-    User aur
+Host flattoaster
+    HostName 10.17.21.10
+    User root
 
 Host lapis
     HostName 10.17.21.30
     User joe
 
+
+# SSH for git servers
+# Gitlab
+Host gitlab.com
+    IdentityFile ~/.ssh/gitlab
+    UpdateHostKeys no
+
+# Arch User Repo
+Host aur.archlinux.org
+    IdentityFile ~/.ssh/aur
+    User aur
+
+# Personal Git Server
+Host kitsunehosting.net/gitea
+    IdentifyFile ~/.ssh/gitea
+
+
 # Silvertech
 Host devserver
     HostName 10.12.32.35