diff --git a/.config/hexchat/servlist.conf b/.config/hexchat/servlist.conf
index a993508..9bdc268 100644
--- a/.config/hexchat/servlist.conf
+++ b/.config/hexchat/servlist.conf
@@ -1,4 +1,4 @@
-v=2.14.3
+v=2.16.0
 
 N=ZNC: Gnome
 P=psi-jack/Gnome:Vectron623
@@ -13,8 +13,7 @@ N=ZNC: Libera
 P=psi-jack/Libera:Vectron623
 E=UTF-8 (Unicode)
 F=31
-D=1
-S=mail1.linux-help.org/7070
+D=0
 S=znc1c.linux-help.org/7070
 
 N=Libera.Chat
@@ -29,12 +28,12 @@ F=51
 D=0
 S=bbs.deckersheaven.com/6667
 
-N=ZNC: Jhlorn: Freenode
+N=ZNC: Jhlorn: Libera
 I=Jhlorn
 i=Jhlorn_
 U=jhlorn/freenode
 R=jhlorn
-P=jhlorn/freenode:Laserbeam623
+P=jhlorn/Libera:Laserbeam623
 L=7
 E=UTF-8 (Unicode)
 F=21
diff --git a/.profile b/.profile
index 8b892e2..6fa0100 100644
--- a/.profile
+++ b/.profile
@@ -6,3 +6,4 @@ export EDITOR=vim
 export PATH=$PATH:$HOME/bin:$HOME/go/bin
 #export QT_QPA_PLATFORMTHEME=qgnomeplatform
 
+. "$HOME/.cargo/env"
diff --git a/.zshenv b/.zshenv
index 121400e..e767314 100644
--- a/.zshenv
+++ b/.zshenv
@@ -7,3 +7,4 @@
 : ${ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim}
 # }}} End configuration added by Zim install
 
+. "$HOME/.cargo/env"
diff --git a/.zshrc b/.zshrc
index 47374a8..d420a76 100644
--- a/.zshrc
+++ b/.zshrc
@@ -122,21 +122,14 @@ bindkey -M vicmd 'k' history-substring-search-up
 bindkey -M vicmd 'j' history-substring-search-down
 # }}} End configuration added by Zim install
 
-<<<<<<< HEAD
-=======
 # Homebrew
 eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
->>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
 
 # Set Path:
 typeset -U PATH
 PATH="$HOME/bin:$HOME/.local/bin:$PATH"
 export PATH
 
-<<<<<<< HEAD
-
-=======
->>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
 # Portable alternative to readlink -f
 zpath() { cd -P . || return
   _out() { printf "%s$_zdlm\n" "$PWD/${1##*/}"; }