diff --git a/gtk/.config/gtk-3.0/servers b/gtk/.config/gtk-3.0/servers
index 08c3f38..61a0386 100644
--- a/gtk/.config/gtk-3.0/servers
+++ b/gtk/.config/gtk-3.0/servers
@@ -23,86 +23,4 @@
-<<<<<<< Updated upstream
-||||||| Stash base
-
- / on sftp.cloud100.15five.com
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
-
- / on sftp.cloud100.15five.com
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- / on greip.unbl.ink
-
-
-
-
-
-
-
-
-
- / on pandora.unbl.ink
-
-
-
-
-
-
-
-
-
->>>>>>> Stashed changes