diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 3e02277..ff3f3f8 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -207,8 +207,7 @@ alias gwx='git rm -r'
 alias gwX='git rm -rf'
 
 # Open modified files
-# ACMR = Added || Copied || Modified || Renamed
-alias v="nvim"
+# ACMRU = Added || Copied || Modified || Renamed || Unmerged
 # Edit all uncommitted files that have changes since the last commit (be they staged or unstaged)
 alias vd="nvim (git diff HEAD --name-only --diff-filter=ACMR)"
 # Edit all staged files that have changes since the last commit
@@ -217,3 +216,7 @@ alias vds="nvim (git diff --staged --name-only --diff-filter=ACMR)"
 alias vdc="nvim (git diff HEAD^ --name-only --diff-filter=ACMR)"
 # Edit files changed since master
 alias vdm="nvim (git diff master --name-only --diff-filter=ACMR)"
+# Edit files unmerged
+alias vdu="nvim (git diff --name-only --diff-filter=U | uniq)"
+# Add unmerged files
+alias vdua="git add (git diff --name-only --diff-filter=U)"