diff --git a/.config/emacs/config.el b/.config/emacs/config.el
index e5d525f..7160b78 100644
--- a/.config/emacs/config.el
+++ b/.config/emacs/config.el
@@ -263,8 +263,8 @@
     "a" '(:ignore t :wk "A.I.")
     "a a" '(ellama-ask-about :wk "Ask ellama about region")
     "a e" '(:ignore t :wk "Ellama enhance")
-    "a e g" '(ellama-improve-wording :wk "Ellama enhance grammar")
-    "a e w" '(ellama-improve-grammar :wk "Ellama enhance wording")
+    "a e g" '(ellama-improve-grammar :wk "Ellama enhance wording")
+    "a e w" '(ellama-improve-wording :wk "Ellama enhance grammar")
     "a i" '(ellama-chat :wk "Ask ellama")
     "a p" '(ellama-provider-select :wk "Ellama provider select")
     "a s" '(ellama-summarize :wk "Ellama summarize region")
diff --git a/.config/emacs/config.org b/.config/emacs/config.org
index 0b83a31..777aa4b 100644
--- a/.config/emacs/config.org
+++ b/.config/emacs/config.org
@@ -1,5 +1,9 @@
+<<<<<<< HEAD
 
 #+TITLE: DT's GNU Emacs Config
+=======
++TITLE: DT's GNU Emacs Config
+>>>>>>> 5ea1b34d7a73b295c19ecae4d963083c5ffac771
 #+AUTHOR: Derek Taylor (DT)
 #+DESCRIPTION: DT's personal Emacs config.
 #+STARTUP: showeverything