diff --git a/fish/.config/fish/functions/gm.fish b/fish/.config/fish/functions/gm.fish
index 644c6e4..3a6915d 100644
--- a/fish/.config/fish/functions/gm.fish
+++ b/fish/.config/fish/functions/gm.fish
@@ -1,3 +1,8 @@
 function gm
-    git merge $argv
+    if count $argv >/dev/null
+        git merge $argv
+    else
+        set -l remote (git symbolic-ref refs/remotes/origin/HEAD | awk -F'/' '{print $4}')
+        git merge origin/$remote
+    end
 end