diff --git a/.bashrc b/.bashrc
index 6bcc1b1..1a8ba9c 100755
--- a/.bashrc
+++ b/.bashrc
@@ -180,19 +180,13 @@ PS1="${CYAN}[\u@\h ${YELLOW}\w${GREEN}\$(parse_git_branch)${CYAN}]${WHITE}${RESE
 #######################################################
 # SSH
 #######################################################
-<<<<<<< Updated upstream
-# Set SSH_AUTH_SOCK to use Gnome Keyring's SSH agent
-export SSH_AUTH_SOCK="/run/user/1000/keyring/ssh"
-
-todo ls
-=======
 
 keys() 
 {
-  eval "$(keychain --eval --quiet ry_ecdsa)"
-  eval "$(keychain --eval --quiet id_rsa)"
+  eval "$(keychain --quiet --absolute --dir "$XDG_CONFIG_HOME"/keychain --eval ry_ecdsa)"
+  eval "$(keychain --quiet --absolute --dir "$XDG_CONFIG_HOME"/keychain --eval id_rsa)"
 }
 
 keys
 
->>>>>>> Stashed changes
+todo ls