diff --git a/.gitignore b/.gitignore
index 8c9c8409..f6a6c8ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,6 @@ ENV/
 # macOS
 .DS_Store
 /.coverage.*
+
+# obsidian docs:
+/docs/.obsidian/
\ No newline at end of file
diff --git a/docs/.obsidian/app.json b/docs/.obsidian/app.json
index 9e26dfee..3dbf4adc 100644
--- a/docs/.obsidian/app.json
+++ b/docs/.obsidian/app.json
@@ -1 +1,7 @@
-{}
\ No newline at end of file
+<<<<<<< HEAD
+{}
+=======
+{
+  "readableLineLength": false
+}
+>>>>>>> pre-beta-prep
diff --git a/docs/.obsidian/workspace.json b/docs/.obsidian/workspace.json
index 31c61916..79efe97f 100644
--- a/docs/.obsidian/workspace.json
+++ b/docs/.obsidian/workspace.json
@@ -11,10 +11,21 @@
             "id": "cd58e5dfc86465e3",
             "type": "leaf",
             "state": {
+<<<<<<< HEAD
               "type": "empty",
               "state": {},
               "icon": "lucide-file",
               "title": "New tab"
+=======
+              "type": "markdown",
+              "state": {
+                "file": "Getting Started with Basic Memory.md",
+                "mode": "preview",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "Getting Started with Basic Memory"
+>>>>>>> pre-beta-prep
             }
           }
         ]
@@ -162,6 +173,13 @@
       "command-palette:Open command palette": false
     }
   },
+<<<<<<< HEAD
   "active": "a06f3217ff27ae41",
   "lastOpenFiles": []
+=======
+  "active": "cd58e5dfc86465e3",
+  "lastOpenFiles": [
+    "User Guide.md"
+  ]
+>>>>>>> pre-beta-prep
 }
\ No newline at end of file
diff --git a/docs/Getting Started with Basic Memory.md b/docs/Getting Started with Basic Memory.md
index cb88f582..33fd7a20 100644
--- a/docs/Getting Started with Basic Memory.md	
+++ b/docs/Getting Started with Basic Memory.md	
@@ -117,6 +117,10 @@ Claude will:
 2. Summarize the key findings
 3. Offer to explore specific documents in more detail
 
+<<<<<<< HEAD
+=======
+See [[User Guide#Using Special Prompts]] for further information.
+>>>>>>> pre-beta-prep
 ## Using Your Knowledge Base
 
 ### Referencing Knowledge
diff --git a/docs/User Guide.md b/docs/User Guide.md
index 7a06af09..1603d9e1 100644
--- a/docs/User Guide.md	
+++ b/docs/User Guide.md	
@@ -107,6 +107,7 @@ This is useful for:
 
 ### Example
 
+<<<<<<< HEAD
 Choose "Continue Conversation"
 ![[prompt 1.png|500]]
 
@@ -117,6 +118,24 @@ Give instructions
 ![[prompt3.png|500]]
 
 Claude can build context from the supplied topic.
+=======
+Claude Desktop lets you send a prompt to provide context. You can use this at the beginning of a chat to preload context without needing to copy paste all the time. By using one of the supplied prompts, Basic Memory will search the knowledge base and give the AI instructions for how to build context. 
+
+Choose "Continue Conversation":
+
+![[prompt 1.png|500]]
+
+Enter a topic:
+
+![[prompt2.png|500]]
+
+Give optional additional instructions:
+
+![[prompt3.png|500]]
+
+Claude can build context from the supplied topic. This works independently of Claude Project information. All the context comes from your local knowledge base. 
+
+>>>>>>> pre-beta-prep
 ![[prompt4.png|500]]
 
 
diff --git a/src/basic_memory/__init__.py b/src/basic_memory/__init__.py
index 50e14463..67685c01 100644
--- a/src/basic_memory/__init__.py
+++ b/src/basic_memory/__init__.py
@@ -1,3 +1,7 @@
 """basic-memory - Local-first knowledge management combining Zettelkasten with knowledge graphs"""
 
+<<<<<<< HEAD
 __version__ = "0.9.0"
+=======
+__version__ = "0.8.0"
+>>>>>>> pre-beta-prep