diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index ac4f510..7bb3e30 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -74,15 +74,8 @@ Host penobscotbaypress.com
 # bhyve VMs
 Host mopidy.local
   User powellc
-<<<<<<< Updated upstream
 Host jellyfin.local
   User ubuntu
-||||||| constructed merge base
-=======
-# Jellyfin VM
-Host jellyfin.local
-  User ubuntu
->>>>>>> Stashed changes
 
 # Git uses it's own port
 Host git.local