diff --git a/content/posts/2024-07-01-part-6-fish-shell-as-part-of-your-development-workflow/index.md b/content/posts/2024-07-01-part-6-fish-shell-as-part-of-your-development-workflow/index.md
index bb7a25c..1b04cc8 100644
--- a/content/posts/2024-07-01-part-6-fish-shell-as-part-of-your-development-workflow/index.md
+++ b/content/posts/2024-07-01-part-6-fish-shell-as-part-of-your-development-workflow/index.md
@@ -6,7 +6,11 @@ tags:
   - fish
   - shell
 series:
+<<<<<<< Updated upstream
   - Set up Your Development Workflow
+=======
+  - Setup Your Development Workflow
+>>>>>>> Stashed changes
 cover:
   image: images/cover.png
 ---