diff --git a/emacs/+org.el b/emacs/+org.el
index 9914b4d..da22b58 100644
--- a/emacs/+org.el
+++ b/emacs/+org.el
@@ -19,21 +19,17 @@ 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")
-   org-roam-directory (file-truename "~/org/Roam/"))
-
 (setq org-agenda-files (list (concat org-directory "Todos/")))
 ;; (setq org-agenda-files (list
 ;;        (concat org-directory +org-capture-work-todo-file )
 ;;        (concat org-directory "todo.org")
 ;;        )
 ;;   )
-=======
->>>>>>> 42f5154 (Simplified where stuff is.)
 
+(setq org-agenda-files (list
+       (concat org-directory "Todos/" )
+       )
+  )
 ;(org-agenda-files (file-expand-wildcards (concat org-directory "*". )"~/ref/*.org")
 ;; Automatically Scan normal locations code for projectes.
 ;;  - `src`  is used on my linux machine
@@ -104,10 +100,5 @@ 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")