         regexp-search-ring))
 
 ;; From http://pages.sachachua.com/.emacs.d/Sacha.html#sec-1-5-12
-(defun sacha/smarter-move-beginning-of-line (arg)
+(defun ar/smarter-move-beginning-of-line (arg)
   "Move point back to indentation of beginning of line.
 
 Move point to the first non-whitespace character on this line.


;; remap C-a to `smarter-move-beginning-of-line'
(global-set-key [remap move-beginning-of-line]
                'sacha/smarter-move-beginning-of-line)

(use-package whole-line-or-region :ensure t)
(whole-line-or-region-mode)

  (hydra-smerge/body))
(add-hook 'smerge-mode-hook #'ar/smerge-mode-hook-function)

(defun ar/try-smerge ()
  "Activate smerge on conflicts."
  (save-excursion
    (goto-char (point-min))
    (when (re-search-forward "^<<<<<<< " nil t)
      (smerge-mode 1))))
(add-hook 'find-file-hook #'ar/try-smerge t)

;; Hotspots WIP.
;; (setq ar/helm-source-hotspots '((name . "Hotspots")
