diff --git a/.gitignore b/.gitignore
index f7cc6bdf..d5518c21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 .obsidian/plugins/obsidian-pandoc-reference-list/data.json
 .obsidian/workspace.json
-
+.sessions
 
 
 
 # Ignore Smart Environment folder
-.smart-env
\ No newline at end of file
+.smart-env
diff --git a/.sessions/Journal.vim b/.sessions/Journal.vim
index a7e50ea5..0b5429db 100644
--- a/.sessions/Journal.vim
+++ b/.sessions/Journal.vim
@@ -28,12 +28,12 @@ setlocal fdn=20
 setlocal fen
 silent! normal! zE
 let &fdl = &fdl
-let s:l = 116 - ((57 * winheight(0) + 33) / 67)
+let s:l = 117 - ((50 * winheight(0) + 29) / 58)
 if s:l < 1 | let s:l = 1 | endif
 keepjumps exe s:l
 normal! zt
-keepjumps 116
-normal! 028|
+keepjumps 117
+normal! 0
 tabnext 1
 if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'
   silent exe 'bwipe ' . s:wipebuf
diff --git a/.sessions/Thesis_Notes.vim b/.sessions/Thesis_Notes.vim
index 1c3dd603..1c4a85e6 100644
--- a/.sessions/Thesis_Notes.vim
+++ b/.sessions/Thesis_Notes.vim
@@ -3,7 +3,11 @@ let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-
 let v:this_session=expand("<sfile>:p")
 silent only
 silent tabonly
+<<<<<<< HEAD
 cd ~/Documents/Dane\'s\ Vault/5\ Thesis
+=======
+cd ~/Documents/Dane\'s\ Vault
+>>>>>>> origin/master
 if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
   let s:wipebuf = bufnr('%')
 endif
@@ -13,6 +17,7 @@ if &shortmess =~ 'A'
 else
   set shortmess=aoO
 endif
+<<<<<<< HEAD
 badd +16 4\ Meetings/DGC_DAS_328.md
 badd +32 5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md
 argglobal
@@ -20,6 +25,15 @@ argglobal
 edit 5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md
 argglobal
 balt 4\ Meetings/DGC_DAS_328.md
+=======
+badd +16 5\ Thesis/4\ Meetings/DGC_DAS_328.md
+badd +4 5\ Thesis/5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md
+argglobal
+%argdel
+edit 5\ Thesis/5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md
+argglobal
+balt 5\ Thesis/4\ Meetings/DGC_DAS_328.md
+>>>>>>> origin/master
 setlocal fdm=manual
 setlocal fde=0
 setlocal fmr={{{,}}}
@@ -30,12 +44,21 @@ setlocal fdn=20
 setlocal fen
 silent! normal! zE
 let &fdl = &fdl
+<<<<<<< HEAD
 let s:l = 11 - ((10 * winheight(0) + 27) / 55)
 if s:l < 1 | let s:l = 1 | endif
 keepjumps exe s:l
 normal! zt
 keepjumps 11
 normal! 058|
+=======
+let s:l = 13 - ((12 * winheight(0) + 36) / 73)
+if s:l < 1 | let s:l = 1 | endif
+keepjumps exe s:l
+normal! zt
+keepjumps 13
+normal! 0
+>>>>>>> origin/master
 tabnext 1
 if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'
   silent exe 'bwipe ' . s:wipebuf
@@ -49,7 +72,6 @@ if filereadable(s:sx)
 endif
 let &g:so = s:so_save | let &g:siso = s:siso_save
 set hlsearch
-nohlsearch
 doautoall SessionLoadPost
 unlet SessionLoad
 " vim: set ft=vim :
diff --git a/5 Thesis/4 Meetings/DGC_DAS_328.md b/5 Thesis/4 Meetings/DGC_DAS_328.md
index ba17f18d..dc8e4bd6 100644
--- a/5 Thesis/4 Meetings/DGC_DAS_328.md	
+++ b/5 Thesis/4 Meetings/DGC_DAS_328.md	
@@ -18,5 +18,3 @@ The quick brown fox jumps over the lazy dog. The dog stays blissfully asleep. :)
     Questions to answer
     a) How much time does it actually take to send the value back to the controller?
     b) Can you actually read bit by bit for these things?
-    d
-
diff --git a/5 Thesis/5 Resources/Literature_Reviews/A Review of Formal Methods applied to Machine Learning.md b/5 Thesis/5 Resources/Literature_Reviews/A Review of Formal Methods applied to Machine Learning.md
index 59445856..edde1129 100644
--- a/5 Thesis/5 Resources/Literature_Reviews/A Review of Formal Methods applied to Machine Learning.md	
+++ b/5 Thesis/5 Resources/Literature_Reviews/A Review of Formal Methods applied to Machine Learning.md	
@@ -11,6 +11,7 @@ This review seems to talk a good bit about that.
 than other types of programming. Things such as computer vision and decision
 making are very difficult to program manually relative to their ML counterpart.
 
+<<<<<<< HEAD
 - Abstract interpretation can connect different formal methods that otherwise
 would seem disjoint, according to these authors.
 
@@ -31,3 +32,5 @@ trees :( What did they ever do to you man!
 - They also mention that formal methods for data preparation and training are
 very much works in progress.
 
+=======
+>>>>>>> origin/master
diff --git a/900s Calendars/Research/2025-04-02 Canonical Talk NSH 3305 CMU.md b/900s Calendars/Research/2025-04-02 Canonical Talk NSH 3305 CMU.md
new file mode 100644
index 00000000..916a6ebd
--- /dev/null
+++ b/900s Calendars/Research/2025-04-02 Canonical Talk NSH 3305 CMU.md	
@@ -0,0 +1,8 @@
+---
+title: Canonical Talk NSH 3305 CMU
+allDay: false
+startTime: 12:00
+endTime: 13:00
+date: 2025-04-02
+completed: null
+---
diff --git a/9999 Personal/Journal/20250331_Should_I_Continue.md b/9999 Personal/Journal/20250331_Should_I_Continue.md
index 23553be1..522761de 100644
--- a/9999 Personal/Journal/20250331_Should_I_Continue.md	
+++ b/9999 Personal/Journal/20250331_Should_I_Continue.md	
@@ -1,3 +1,6 @@
+# What should I do about my PhD?
+---
+
 The quick brown fox jumps over the lazy dog. The dog stays blissfully asleep. :)
 
 This time, I'm actually going to begin writing a journal. I feel like I have a 
diff --git a/9999 Personal/Z/Harbor Freight Shopping List.md b/9999 Personal/Z/Harbor Freight Shopping List.md
new file mode 100644
index 00000000..7d69b052
--- /dev/null
+++ b/9999 Personal/Z/Harbor Freight Shopping List.md	
@@ -0,0 +1,3 @@
+1) 3/8" ratchet
+2) 24mm socket
+3) new sawzall blades
\ No newline at end of file
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
new file mode 100644
index 00000000..179f4cdc
--- /dev/null
+++ b/conflict-files-obsidian-git.md
@@ -0,0 +1,18 @@
+# Conflicts
+Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
+(This file will automatically be deleted before commit)
+[[#Additional Instructions]] available below file list
+
+- Not a file: .sessions/Thesis_Notes.vim
+- [[A Review of Formal Methods applied to Machine Learning]]
+
+# Additional Instructions
+I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
+
+```diff
+<<<<<<< HEAD
+    File changes in local repository
+=======
+    File changes in remote repository
+>>>>>>> origin/main
+```
\ No newline at end of file