will it woek

.obsidian/community-plugins.json

@@ -3,5 +3,10 @@
   "obsidian-extract-pdf-annotations",
   "obsidian-style-settings",
   "obsidian-latex-suite",
+<<<<<<< HEAD
   "obsidian-matrix"
+=======
+  "obsidian-matrix",
+  "omnisearch"
+>>>>>>> feature-branch
 ]

.obsidian/plugins/omnisearch/data.json

@@ -0,0 +1,20 @@
+{
+  "hideExcluded": false,
+  "ignoreDiacritics": true,
+  "indexedFileTypes": [],
+  "PDFIndexing": false,
+  "imagesIndexing": false,
+  "showShortName": false,
+  "ribbonIcon": true,
+  "showExcerpt": true,
+  "renderLineReturnInExcerpts": true,
+  "showCreateButton": false,
+  "hightlight": true,
+  "showPreviousQueryResults": true,
+  "simpleSearch": false,
+  "weightBasename": 2,
+  "weightH1": 1.5,
+  "weightH2": 1.3,
+  "weightH3": 1.1,
+  "welcomeMessage": "1.8.0-beta.3"
+}

.obsidian/workspace.json

@@ -158,7 +158,10 @@
   },
   "active": "630c2dee08cf5f73",
   "lastOpenFiles": [
+<<<<<<< HEAD
     "Domains.md",
+=======
+>>>>>>> feature-branch
     "Coding Tips (Classical)/Terminal Tips/Shells/Internet/Tools/Workspaces.md",
     "Coding Tips (Classical)/Terminal Tips/Shells/Internet/Tools/Webscraping.md",
     "Coding Tips (Classical)/Terminal Tips/Shells/Internet/Tools/Webi.md",
@@ -200,6 +203,10 @@
     "Coding Tips (Classical)/Python/tools/IPython/Colab/Colab Shortcuts.md",
     "Coding Tips (Classical)/Python/tools/IPython/Colab/Colab Scratch Code Cells.md",
     "Coding Tips (Classical)/Python/tools/IPython/Colab/Colab Forms.md",
+<<<<<<< HEAD
+=======
+    "Coding Tips (Classical)/Python/tools/IPython/Colab/Colab Command Palette.md",
+>>>>>>> feature-branch
     "Coding Tips (Classical)/Python/tools/IPython/Colab",
     "Coding Tips (Classical)/Python/tools/IPython",
     "Coding Tips (Classical)/Python/tools/Frameworks",