1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 7efe1e6ff08..7175ec2c40d 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -1228,7 +1228,8 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict."
 If no conflict maker is found, turn off `smerge-mode'."
   (smerge-mode 1)
   (condition-case nil
-      (smerge-next)
+      (unless (looking-at smerge-begin-re)
+        (smerge-next))
     (error (smerge-auto-leave))))
 
 (provide 'smerge-mode)