diff --git a/1 Daily Notes/2024/11 November/2024-11-19.md b/1 Daily Notes/2024/11 November/2024-11-19.md
index cc6074d2..bdd2b9dc 100644
--- a/1 Daily Notes/2024/11 November/2024-11-19.md	
+++ b/1 Daily Notes/2024/11 November/2024-11-19.md	
@@ -7,6 +7,12 @@ tags:
 # This Week's Weekly Note
 [[ Weekly Note 2024-11-13]]
 # Tasks for today
+## Plan
+- HW9 for NUCE 2100
+- Mini project 2?
+- Therapy appt
+- Create outline for presentation
+>>>>>>> origin/master
 ## Due
 ```dataview
 task
@@ -16,7 +22,10 @@ where
 	and !completed
 	and status != "-"
 sort due asc
+<<<<<<< HEAD
 group by file.folder
+=======
+>>>>>>> origin/master
 ```
 ## Scheduled
 ```dataview
diff --git a/300s School/ME 2016 - Nonlinear Dynamical Systems 1/Mini Project.md b/300s School/ME 2016 - Nonlinear Dynamical Systems 1/Mini Project.md
index 461f70bf..83f798d3 100644
--- a/300s School/ME 2016 - Nonlinear Dynamical Systems 1/Mini Project.md	
+++ b/300s School/ME 2016 - Nonlinear Dynamical Systems 1/Mini Project.md	
@@ -8,4 +8,5 @@
 	- [x] Make things 'VERY CLEAR' [completion:: 2024-11-18]
 - [x] Numerical Solution [completion:: 2024-11-18]
 	- [x] Recreate figure 3 [completion:: 2024-11-18]
-	- [x] Make a parallel implementation [completion:: 2024-11-18]
\ No newline at end of file
+	- [x] Make a parallel implementation [completion:: 2024-11-18]
+