From 20ee5f18a52b87fb68652021550bf6adf67e257d Mon Sep 17 00:00:00 2001
From: James Nguyen <james@jojojames.com>
Date: Sat, 23 Nov 2024 14:27:26 -0500
Subject: [PATCH] Fix smerge (#818)

---
 evil-collection.el                               | 1 +
 modes/smerge-mode/evil-collection-smerge-mode.el | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/evil-collection.el b/evil-collection.el
index b8e3429f..8bcef7d8 100644
--- a/evil-collection.el
+++ b/evil-collection.el
@@ -308,6 +308,7 @@ See `evil-collection-init' and `evil-collection--modes-with-delayed-setup'."
     simple-mpc
     slime
     sly
+    smerge-mode
     snake
     so-long
     speedbar
diff --git a/modes/smerge-mode/evil-collection-smerge-mode.el b/modes/smerge-mode/evil-collection-smerge-mode.el
index 7e44eec1..fa939c54 100644
--- a/modes/smerge-mode/evil-collection-smerge-mode.el
+++ b/modes/smerge-mode/evil-collection-smerge-mode.el
@@ -34,18 +34,21 @@
 ;;;###autoload
 (defun evil-collection-smerge-mode-setup ()
   "Setup up `evil' bindings for `smerge-mode'."
+  (add-hook 'smerge-mode-hook #'evil-normalize-keymaps)
   (evil-collection-define-key 'normal 'smerge-mode-map
     "gj" 'smerge-next
     "]]" 'smerge-next
     "gk" 'smerge-prev
     "[[" 'smerge-prev
+    "gr" 'smerge-resolve
     "ga" 'smerge-keep-all
     "gu" 'smerge-keep-upper
     "gl" 'smerge-keep-lower
     "go" 'smerge-keep-other
     "gm" 'smerge-keep-mine
     "gc" 'smerge-combine-with-next
-    "gr" 'smerge-refine
+    "gR" 'smerge-refine
     "gb" 'smerge-keep-base))
+
 (provide 'evil-collection-smerge-mode)
 ;;; evil-collection-smerge-mode.el ends here