diff --git a/.obsidian/plugins/obsidian-pandoc-reference-list/data.json b/.obsidian/plugins/obsidian-pandoc-reference-list/data.json
index 1f98dc46..6d5974d5 100755
--- a/.obsidian/plugins/obsidian-pandoc-reference-list/data.json
+++ b/.obsidian/plugins/obsidian-pandoc-reference-list/data.json
@@ -5,7 +5,11 @@
     {
       "id": 2,
       "name": "Cole Group",
+<<<<<<< HEAD
       "lastUpdate": 1724678552052
+=======
+      "lastUpdate": 1724444879612
+>>>>>>> origin/master
     }
   ],
   "renderCitations": true,
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 4473fd60..ead37c54 100755
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -18,8 +18,21 @@
                 "source": false
               }
             }
+          },
+          {
+            "id": "a59bc03ec6d3008e",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": true
+              }
+            }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -85,7 +98,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "1. Daily Notes/8. August/2024-08-23.md",
+                "file": "conflict-files-obsidian-git.md",
                 "collapseAll": true,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -102,7 +115,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "1. Daily Notes/8. August/2024-08-23.md",
+                "file": "conflict-files-obsidian-git.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -125,7 +138,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "1. Daily Notes/8. August/2024-08-23.md"
+                "file": "conflict-files-obsidian-git.md"
               }
             }
           }
@@ -148,13 +161,15 @@
       "templater-obsidian:Templater": false
     }
   },
-  "active": "340833ec4499e6ab",
+  "active": "a59bc03ec6d3008e",
   "lastOpenFiles": [
+    "1. Daily Notes/8. August/2024-08-23.md",
+    "conflict-files-obsidian-git.md",
+    "Random things I found that I should look into.md",
     "1. Daily Notes/8. August/2024-08-05.md",
     "Setting up a virtual python environment (venv).md",
     "Setting up Neovim for Python.md",
     "Learning How to Use Github.md",
-    "1. Daily Notes/8. August/2024-08-23.md",
     "test",
     "Learn how to use GitHub.md",
     "1. Daily Notes/8. August/2024-08-22.md",
@@ -178,8 +193,6 @@
     "1. Daily Notes/8. August/2024-08-20.md",
     "1. Daily Notes/8. August/2024-08-19.md",
     "2. Cole Group Meeting Notes/Cole Group Monitor Reccomendations.md",
-    "99. Getting Used to Obsidian/Markdown Cheat Sheet.md",
-    "100. Managerial Pages/1. Task Dashboard.md",
     "4. Denoising Diffusion Probabalistic Models for Robust Control",
     "199. Paper Surveys",
     "1. Daily Notes/8. August",
diff --git a/1. Daily Notes/8. August/2024-08-23.md b/1. Daily Notes/8. August/2024-08-23.md
index 43ef1f1a..0602cbf8 100644
--- a/1. Daily Notes/8. August/2024-08-23.md	
+++ b/1. Daily Notes/8. August/2024-08-23.md	
@@ -11,14 +11,14 @@ tags:
 
 ## Tasks for today
 ### Big Task
- - [/] [[Learning how to use GitHub]]
+ - [x] [[Learning how to use GitHub]] ✅ 2024-08-23
 ### Medium Tasks
-- [ ] [[2. pymodbus On the BeagleBone]]
+- [/] [[2. pymodbus On the BeagleBone]]
 - [ ] [[Zotero Web Sever]]
 - [ ] [[Task Management in Obsidian]]
 ### Small Tasks
-- [ ] PiHole?
-- [ ] Email! 
+- [/] PiHole?
+- [x] Email! ✅ 2024-08-23
 - [ ] 
 - [ ] 
 - [ ] 
diff --git a/Learning How to Use Github.md b/Learning How to Use Github.md
index 7fea9cf9..420e1214 100755
--- a/Learning How to Use Github.md	
+++ b/Learning How to Use Github.md	
@@ -29,7 +29,7 @@ Upload this key to GitHub- go to settings>SSH and GPG keys>add the new key
 Then add they key to the local SSH agent:
 ```bash
 eval "$(ssh-agent -s)"
-sshadd ~/.ssh/id_ed5519
+ssh-add ~/.ssh/id_ed5519
 ```
 
 ## Using an existing repository
@@ -74,4 +74,4 @@ git switch -c new-branch
 #push the new branch back to remote
 git push -u origin new-branch
 #git push (set new pushes to new branch spec) (remote destination) (branch name)
-```
\ No newline at end of file
+```
diff --git a/Random things I found that I should look into.md b/Random things I found that I should look into.md
new file mode 100644
index 00000000..2e9bfc21
--- /dev/null
+++ b/Random things I found that I should look into.md	
@@ -0,0 +1 @@
+[Vim for MATLAB](https://github.com/daeyun/vim-matlab)