1 files changed, 1 insertions, 1 deletions
diff --git a/init.el b/init.el
index afbdde2..851ee68 100644
--- a/init.el
+++ b/init.el
@@ -909,7 +909,7 @@
   (add-hook 'smerge-mode-hook
             (lambda ()
               (if smerge-mode
-                  (when flycheck-mode
+                  (when (bound-and-true-p flycheck-mode)
                     (setq km/smerge-restore-flycheck t)
                     (flycheck-mode -1))
                 (when km/smerge-restore-flycheck