diff --git a/modules/emacs/vc/autoload/hydra.el b/modules/emacs/vc/autoload/hydra.el
index 65272d4c306..d8c84d1e3e5 100644
--- a/modules/emacs/vc/autoload/hydra.el
+++ b/modules/emacs/vc/autoload/hydra.el
@@ -20,7 +20,7 @@
 "
     ("g" (progn (goto-char (point-min)) (smerge-next)))
     ("G" (progn (goto-char (point-max)) (smerge-prev)))
-    ("C-j" smerge-next)
+    ("C-j" smerge-vc-next-conflict)
     ("C-k" smerge-prev)
     ("j" next-line)
     ("k" previous-line)