diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index f82d648..710b957 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -16,12 +16,8 @@ export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME ; set -gx PATH $HOME/.cabal/bin /home/tsousa/.ghcup/bin $PATH # ghcup-env
 fish_add_path $HOME/.local/share/nvim/mason/bin/
 fish_add_path $HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin
-<<<<<<< HEAD
-fish_add_path $HOME/.config/emacs/bin/
-=======
 fish_add_path $HOME/.cargo/bin/
 fish_add_path $HOME/.config/emacs/bin
->>>>>>> acb4dfaf16e54fbe9a7cc850f7c54d6b6b4f59ab
 
 starship init fish | source
 
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index 5ba2057..a63530f 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -40,8 +40,5 @@ SETUVAR fish_pager_color_selected_background:\x1d
 SETUVAR fish_pager_color_selected_completion:\x1d
 SETUVAR fish_pager_color_selected_description:\x1d
 SETUVAR fish_pager_color_selected_prefix:\x1d
-<<<<<<< HEAD
 SETUVAR fish_user_paths:/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin\x1e/home/tsousa/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin
-=======
 SETUVAR fish_user_paths:/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2ecargo/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin\x1e/home/tsousa/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin
->>>>>>> acb4dfaf16e54fbe9a7cc850f7c54d6b6b4f59ab