Add a smerge-keep-all keybinding.
Add a smerge-keep-all keybinding.

Also refactor to juse use use-package.

Wilfred/.emacs.d,Wilfred/.emacs.d,Wilfred/.emacs.d,Wilfred/.emacs.d,Wilfred/.emacs.d,Wilfred/.emacs.d,Wilfred/.emacs.d