diff --git a/fish/fish_plugins b/fish/fish_plugins
index 140b536..36184bd 100644
--- a/fish/fish_plugins
+++ b/fish/fish_plugins
@@ -1,3 +1,6 @@
 patrickf1/fzf.fish
+<<<<<<< Updated upstream
 jorgebucaran/fisher
+=======
+>>>>>>> Stashed changes
 reitzig/sdkman-for-fish@v2.1.0