diff --git a/modules/editor/evil/init.el b/modules/editor/evil/init.el
index aba5af168..9da179a8c 100644
--- a/modules/editor/evil/init.el
+++ b/modules/editor/evil/init.el
@@ -221,6 +221,7 @@ variable for an explanation of the defaults (in comments). See
       simple
       slime
       sly
+      smerge
       speedbar
       tablist
       tar-mode
diff --git a/modules/editor/evil/packages.el b/modules/editor/evil/packages.el
index 657fbcfce..9240fa7fa 100644
--- a/modules/editor/evil/packages.el
+++ b/modules/editor/evil/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/evil/packages.el
 
-(package! evil :pin "07aba40dd32c667f36eb1ad244f859983a077d12")
+(package! evil :pin "b00018bf550fbbe1b55165579e6ede973d70f53b")
 (package! evil-args :pin "758ad5ae54ad34202064fec192c88151c08cb387")
 (package! evil-easymotion :pin "f96c2ed38ddc07908db7c3c11bcd6285a3e8c2e9")
 (package! evil-embrace :pin "464e8ec52ff78edf3c9060143fc375f6ce5f275f")
@@ -35,4 +35,4 @@
     (package! neotree)
     (autoload 'neotree-make-executor "neotree" nil nil 'macro))
 
-  (package! evil-collection :pin "652d74acfb5789eacef36660c4ffc68905c8d741"))
+  (package! evil-collection :pin "1b9d5c5d939b6eae13b6e545e53faee958af460a"))
diff --git a/modules/editor/god/packages.el b/modules/editor/god/packages.el
index c57e01209..4b80c50fa 100644
--- a/modules/editor/god/packages.el
+++ b/modules/editor/god/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/god/packages.el
 
-(package! god-mode :pin "1d7d647bb53a49fce03486eba90e97ccf35cf85a")
+(package! god-mode :pin "d7e933095041aa32033d29f2c87d201b5b43c3b3")
diff --git a/modules/editor/lispy/packages.el b/modules/editor/lispy/packages.el
index 3286026c9..c186df573 100644
--- a/modules/editor/lispy/packages.el
+++ b/modules/editor/lispy/packages.el
@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/lispyville/packages.el
 
-(package! lispy :pin "e9731aa95581951ab2cbfaed28f0ac7d71124ac0")
+(package! lispy :pin "bf315768020f98f6139d5f722bd365f1ddd1fb52")
 (when (featurep! :editor evil)
   (package! lispyville :pin "9c14bed0359f659e246d345c706f895737c3d172"))
diff --git a/modules/editor/snippets/packages.el b/modules/editor/snippets/packages.el
index 4d1975e4f..dd58a25ef 100644
--- a/modules/editor/snippets/packages.el
+++ b/modules/editor/snippets/packages.el
@@ -7,4 +7,4 @@
   :recipe (:host github
            :repo "hlissner/doom-snippets"
            :files ("*.el" "*"))
-  :pin "5c0eb5bd70f035cefb981c2ce64f4367498bdda6")
+  :pin "3083b2342f95fa55c1fd3b4a16229c5d867a02b0")