diff --git a/emacs/+org.el b/emacs/+org.el
index 0e1e2e0..9914b4d 100644
--- a/emacs/+org.el
+++ b/emacs/+org.el
@@ -2,6 +2,11 @@
 (require 'org)
 
 (custom-set-variables '(org-directory "~/org/"))
+(setq
+   deft-directory org-directory
+   org-download-image-dir (concat org-directory ".attach/")
+   org-roam-directory (concat org-directory "Roam/")
+   )
 
 (defvar +org-capture-work-todo-file "Work/todo.org"
   "location for my work todo list.
@@ -14,6 +19,7 @@ If it is an absolute path return `+org-capture-work-todo-file' verbatim."
   (expand-file-name +org-capture-work-todo-file org-directory))
 
 
+<<<<<<< HEAD
 (setq
    deft-directory org-directory
    org-download-image-dir (concat org-directory "resources")
@@ -25,6 +31,8 @@ If it is an absolute path return `+org-capture-work-todo-file' verbatim."
 ;;        (concat org-directory "todo.org")
 ;;        )
 ;;   )
+=======
+>>>>>>> 42f5154 (Simplified where stuff is.)
 
 ;(org-agenda-files (file-expand-wildcards (concat org-directory "*". )"~/ref/*.org")
 ;; Automatically Scan normal locations code for projectes.
@@ -96,7 +104,10 @@ If it is an absolute path return `+org-capture-work-todo-file' verbatim."
                (file+headline +org-capture-work-todo-file "Inbox")
                "* [_] %?%i\n%a" :prepend t))
 
+<<<<<<< HEAD
 (setq org-roam-directory "~/org/Roam")
 
+=======
+>>>>>>> 42f5154 (Simplified where stuff is.)
 
 (load! "org/+babel-diff")