diff --git a/.ssh/config b/.ssh/config
index 11b7855..b71050f 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -52,7 +52,6 @@ Host aur.archlinux.org
     IdentityFile ~/.ssh/aur
     User aur
 
-<<<<<<< Updated upstream
 # Personal Git Server
 Host kitsunehosting.net
     Port 2222