   ("o" smerge-keep-other "keep other")
   ("b" smerge-keep-base "keep base")
   ("a" smerge-keep-all "keep all")
-  ("q" nil "cancel"))
+  ("q" nil "quit"))
 
 (defun ar/smerge-mode-hook-function ()
   "Called when entering smerge mode."

   "git"
   ("r" git-gutter+-revert-hunk "revert hunk")
   ("p" git-gutter+-popup-hunk "pop hunk")
   ("q" nil "cancel")))

(require 'smerge-mode)
(defhydra hydra-smerge (:color red)

   ("p" git-gutter+-previous-hunk "previous")
   ("r" git-gutter+-revert-hunk "revert")
   ("d" git-gutter+-popup-hunk "diff")
   ("q" nil "quit")))

(global-set-key
 (kbd "C-c g")
