diff --git a/.obsidian/app.json b/.obsidian/app.json
new file mode 100644
index 0000000..1d46fa1
--- /dev/null
+++ b/.obsidian/app.json
@@ -0,0 +1,29 @@
+<<<<<<< HEAD
+{
+  "mobileToolbarCommands": [
+    "editor:undo",
+    "editor:redo",
+    "editor:insert-wikilink",
+    "editor:insert-embed",
+    "editor:insert-tag",
+    "editor:attach-file",
+    "editor:set-heading",
+    "editor:toggle-bold",
+    "editor:toggle-italics",
+    "editor:toggle-strikethrough",
+    "editor:toggle-highlight",
+    "editor:toggle-code",
+    "editor:toggle-blockquote",
+    "editor:insert-link",
+    "editor:toggle-bullet-list",
+    "editor:toggle-numbered-list",
+    "editor:toggle-checklist-status",
+    "editor:indent-list",
+    "editor:unindent-list",
+    "editor:configure-toolbar",
+    "obsidian-git:push"
+  ]
+}
+=======
+{}
+>>>>>>> cd9eadb092dcc3ec5e4f3b3f69b20cd46ba7c35c
diff --git a/.obsidian/core-plugins.json b/.obsidian/core-plugins.json
new file mode 100644
index 0000000..fc3ccb2
--- /dev/null
+++ b/.obsidian/core-plugins.json
@@ -0,0 +1,37 @@
+{
+  "file-explorer": true,
+  "global-search": true,
+  "switcher": true,
+  "graph": true,
+  "backlink": true,
+  "canvas": true,
+  "outgoing-link": true,
+  "tag-pane": true,
+  "footnotes": false,
+  "properties": true,
+  "page-preview": true,
+  "daily-notes": true,
+  "templates": true,
+  "note-composer": true,
+  "command-palette": true,
+  "slash-command": false,
+  "editor-status": true,
+  "bookmarks": true,
+  "markdown-importer": false,
+  "zk-prefixer": false,
+  "random-note": false,
+  "outline": true,
+  "word-count": true,
+  "slides": false,
+  "audio-recorder": false,
+  "workspaces": false,
+  "file-recovery": true,
+  "publish": false,
+  "sync": true,
+<<<<<<< HEAD
+  "bases": true
+=======
+  "bases": true,
+  "webviewer": false
+>>>>>>> cd9eadb092dcc3ec5e4f3b3f69b20cd46ba7c35c
+}
\ No newline at end of file
diff --git a/.obsidian/workspace-mobile.json b/.obsidian/workspace-mobile.json
index a7c451e..ac78ff9 100644
--- a/.obsidian/workspace-mobile.json
+++ b/.obsidian/workspace-mobile.json
@@ -181,6 +181,9 @@
   },
   "active": "44d3e0038362a54a",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "content/Ryan_Pandya_Resume.pdf",
+    "content/flying/N383WA.md",
     "content/flying/index.md",
     "content/index.md"
   ]