    ("b" ar/profiler-start-cpu "begin")
    ("r" profiler-report "report")
    ("e" profiler-stop "end")
-   ("q" nil "cancel")))
+   ("q" nil "quit")))
 
 ;; (global-set-key
 ;;  (kbd "C-c y")
 ;;  (defhydra hydra-root (:color blue)
 ;;    "cheatsheet"
 ;;    ("C-c s" hydra-search/body "search")
-;;    ("q" nil "cancel")))
+;;    ("q" nil "quit")))
 
 ;; Override default flycheck triggers
 (setq flycheck-check-syntax-automatically

   "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)

  ("o" smerge-keep-other "keep other")
  ("b" smerge-keep-base "keep base")
  ("a" smerge-keep-all "keep all")
  ("q" nil "quit"))

(defun ar/smerge-mode-hook-function ()
  "Called when entering smerge mode."
