diff --git a/private_dot_config/doom/config.el b/private_dot_config/doom/config.el
index be3bf63..30cf8f7 100644
--- a/private_dot_config/doom/config.el
+++ b/private_dot_config/doom/config.el
@@ -191,10 +191,10 @@
       (:calendar-id "home"
       		    :files: ("~/org/home.org")
       		    :inbox "~/org/home.org")
-      (:calendar-id "studies-1"
-		    :files: ("~/org/studies.org")
-		    :inbox "~/org/studies.org"
-		    )
+      ;; (:calendar-id "studies-1"
+      ;; 		    :files: ("~/org/studies.org")
+      ;; 		    :inbox "~/org/studies.org"
+      ;; 		    )
       ;; (:calendar-id "some-day-1"
       ;; 		    :files: ("~/org/.archive/someday.org")
       ;; 		    :inbox "~/org/.archive/someday.org")
@@ -287,6 +287,25 @@
 	       '("l" "Someday" entry
 		 (file+headline "~/org/someday.org" "Inbox")
 		 "* TODO %? \n %i " :empty-lines 1) t)
+<<<<<<< HEAD
+=======
+  ;; (add-to-list 'org-capture-templates
+  ;; 	       '("s" "Studies" entry
+  ;; 		 (file+headline "~/org/studies.org" "Inbox")
+  ;; 		 "* TODO [#C] %?\n %i" :empty-lines 1) t)
+;;   (add-to-list 'org-capture-templates
+;; 	       '("S" "Lecture" entry
+;; 		 (file+headline "~/org/studies.org" "Schedule")
+;; 		 "* %^{Subject} %^{Type|Lecture|Section}
+;; :PROPERTIES:
+;; :WILD_NOTIFY_BEFORE: %^{Reminders}
+;; :LOCATION: %^{Location}
+;; :END:
+;; %^{Time}T"
+;;  		:empty-lines 1) t)
+  ;; add this for reminder stuff
+  ;; :PROPERTIES:\n\n:WILD_NOTIFY_BEFORE: %^{Reminders}\n:END:\n
+>>>>>>> 430e06c7fd9cb312399d98d25820a5d3940e7ce7
   (add-to-list 'org-capture-templates
 	       '("W" "Event" entry
 		 (file+headline "~/org/work.org" "Schedule")