diff --git a/obsidian/core-plugins.json b/obsidian/core-plugins.json
index f987e57..77f8a1a 100644
--- a/obsidian/core-plugins.json
+++ b/obsidian/core-plugins.json
@@ -29,5 +29,9 @@
   "sync": false,
   "webviewer": false,
   "footnotes": false,
+<<<<<<< Updated upstream
   "bases": false
+=======
+  "bases": true
+>>>>>>> Stashed changes
 }
\ No newline at end of file