diff --git a/config/.config/i3/config b/config/.config/i3/config
index c8e210e..e37ff3f 100644
--- a/config/.config/i3/config
+++ b/config/.config/i3/config
@@ -353,4 +353,3 @@ bindsym $mod+g mode "default"
 bindsym Return mode "default"
 bindsym Escape mode "default"
 }
-
diff --git a/config/.ssh/config b/config/.ssh/config
index 6e03e21..f352fae 100644
--- a/config/.ssh/config
+++ b/config/.ssh/config
@@ -19,19 +19,7 @@ Host git.tudattr.dev
     User git
     IdentityFile /mnt/veracrypt1/git
 
-Host git.tudattr.dev
-    Hostname 192.168.20.12
-    Port 2222
-    User git
-    IdentityFile /mnt/veracrypt1/git
-
 # Homeserver
-Host behemoth
-     HostName 192.168.30.80
-     Port 22
-     User tuan
-     IdentityFile /mnt/veracrypt1/genesis
-
 Host madrigal
      HostName 192.168.70.1
      Port 2200
@@ -65,26 +53,10 @@ Host mii pi aya01 inko naruto inko.mii pi.mii aya01.mii naruto.mii behemoth behe
     User tudattr
     IdentityFile /mnt/veracrypt1/genesis
 
-<<<<<<< HEAD
-Host inko
-    HostName 192.168.20.14
-    Port 22
-    User tudattr
-    IdentityFile /mnt/veracrypt1/genesis
-
-Host naruto
-    HostName 192.168.20.13
-    Port 22
-||||||| e9d53f0
-Host git.aya01
-    HostName 192.168.20.12
-    Port 23231
-=======
 # Work
 Host mini
     HostName 100.76.45.158
     Port 22
->>>>>>> clean_emacs
     User tudattr
     IdentityFile /mnt/veracrypt1/genesis
 
@@ -94,63 +66,13 @@ Host tail-pi
     User tuant
     IdentityFile /mnt/veracrypt1/work/minis
 
-<<<<<<< HEAD
-Host mii-root
-     HostName 202.61.207.139
-     Port 22
-     User root
-     IdentityFile /mnt/veracrypt1/genesis
-
-Host mii
-     HostName 202.61.207.139
-     Port 22
-     User tudattr
-     IdentityFile /mnt/veracrypt1/genesis
-
-Host aya01.mii
-    HostName 192.168.20.12
-    Port 22
-    User tudattr
-    IdentityFile /mnt/veracrypt1/genesis
-    ProxyJump mii
-
-Host pi.mii
-    HostName 192.168.20.11
-    Port 22
-    User tudattr
-    IdentityFile /mnt/veracrypt1/genesis
-    ProxyJump mii
-
-Host naruto.mii
-    HostName 192.168.20.13
-    Port 22
-    User tudattr
-    IdentityFile /mnt/veracrypt1/genesis
-    ProxyJump mii
-
-# Work
-Host ncs-tailscale
-    HostName 100.93.79.94
-    Port 22
-    User tuant
-    IdentityFile /mnt/veracrypt1/genesis
-
-||||||| e9d53f0
-# Work
-=======
->>>>>>> clean_emacs
 Host ncs-head
     HostName 132.252.68.50
     Port 2122
     User tuan-dat.tran
     IdentityFile /mnt/veracrypt1/genesis
     ForwardX11 yes
-<<<<<<< HEAD
-    ProxyJump ncs-tailscale
-||||||| e9d53f0
-=======
     ProxyJump tail-pi
->>>>>>> clean_emacs
 
 Host ncs-head-user
     HostName 132.252.68.50
@@ -231,47 +153,7 @@ Host ncs-node7
 Host ncs-wedge
     Hostname 192.168.1.5
     User user
-<<<<<<< HEAD
-    IdentityFile /mnt/veracrypt1/genesis
-    # ForwardX11 yes
-    ProxyJump ncs-head
 
-||||||| e9d53f0
-    IdentityFile /mnt/veracrypt1/genesis
-    # ForwardX11 yes
-    ProxyJump ncs-head
-
-Host ncs-local-server
-    HostName 192.168.1.1
-    Port 22
-    User tuan-dat.tran
-    IdentityFile /mnt/veracrypt1/tudattr
-    StrictHostKeyChecking no
-
-Host ncs-local-server-user
-    HostName 192.168.1.1
-    Port 22
-    User user
-    IdentityFile /mnt/veracrypt1/tudattr
-    StrictHostKeyChecking no
-
-Host ncs-local-server2
-    HostName 192.168.2.2
-    Port 22
-    User user
-    IdentityFile /mnt/veracrypt1/tudattr
-    StrictHostKeyChecking no
-    ProxyJump ncs-local-server
-
-Host phone
-    Hostname 192.168.30.245
-    Port 2222
-    User tuan-dat.tran
-    IdentityFile /mnt/veracrypt1/genesis
-
-=======
-
->>>>>>> clean_emacs
 Host ncs-gpu
     Hostname 192.168.1.21
     Port 22
@@ -280,49 +162,12 @@ Host ncs-gpu
     ForwardX11 yes
     ProxyJump ncs-head
     
-<<<<<<< HEAD
-Host ncs-aws-iperf3
-    Hostname 18.185.5.191
-    Port 22
-    User ec2-user
-    IdentityFile /mnt/veracrypt1/work/aws_ncs.pem
-
-||||||| e9d53f0
-Host ncs-aws-iperf3
-    Hostname 18.185.5.191
-    Port 22
-    User ec2-user
-    IdentityFile /mnt/veracrypt1/aws_ncs.pem
-
-=======
->>>>>>> clean_emacs
 Host ami
     Hostname 3.72.156.214
     Port 22
     User ubuntu
     IdentityFile /mnt/veracrypt1/work/aws-rizk.pem
 
-<<<<<<< HEAD
-Host 5g-mec
-    Hostname 192.168.100.1
-    Port 22
-    User udue
-    IdentityFile /mnt/veracrypt1/genesis
-
-Host 5g-mec-ovpn
-    Hostname 192.168.101.1
-    Port 22
-    User udue
-    IdentityFile /mnt/veracrypt1/genesis
-
-Host minis
-    Hostname 192.168.0.115
-    Port 22
-    User tudattr
-    IdentityFile /mnt/veracrypt1/genesis
-
-||||||| e9d53f0
-=======
 
 ## 5g IANA
 Host 5g-iana-mec
@@ -342,4 +187,3 @@ Host uulm-obu0
 
 Host uulm-obu1
     Hostname 192.168.201.11
->>>>>>> clean_emacs
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 8e40241..d7909f6 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -6,14 +6,8 @@ export PenTestTools=$HOME/Local/PenTesting/
 export CTF=$HOME/Documents/CTF/
 export WORKSPACE=$HOME/workspace_l
 export ZSHRC="$HOME/.zshrc"
-<<<<<<< HEAD
-||||||| e9d53f0
-export VISUAL="emacsclient -t"
-export EDITOR="emacsclient -t"
-=======
 export VISUAL="nvim"
 export EDITOR="nvim"
->>>>>>> clean_emacs
 
 
 # History