diff --git a/HISTORY.md b/HISTORY.md
index ae8ffbda0..33c90adb8 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -10,11 +10,12 @@
 - Stronger prompting for the LLM to specify full file paths.
 - Improved shell command prompting.
 - Weak model now uses `extra_headers`, to support Anthropic beta features.
+- New `--install-main-branch` to update to the latest dev version of aider.
 - Improved error messages on attempt to add not-git subdir to chat.
 - Show model metadata info on `--verbose`.
 - Improved warnings when LLMs env variables aren't set.
 - Bugfix to windows filenames which contain `\_`.
-- Aider wrote 64% of the code in this release.
+- Aider wrote 60% of the code in this release.
 
 ### Aider v0.52.1
 
diff --git a/aider/website/HISTORY.md b/aider/website/HISTORY.md
index 3920313d9..ca54c57e3 100644
--- a/aider/website/HISTORY.md
+++ b/aider/website/HISTORY.md
@@ -25,11 +25,12 @@ cog.out(text)
 - Stronger prompting for the LLM to specify full file paths.
 - Improved shell command prompting.
 - Weak model now uses `extra_headers`, to support Anthropic beta features.
+- New `--install-main-branch` to update to the latest dev version of aider.
 - Improved error messages on attempt to add not-git subdir to chat.
 - Show model metadata info on `--verbose`.
 - Improved warnings when LLMs env variables aren't set.
 - Bugfix to windows filenames which contain `\_`.
-- Aider wrote 64% of the code in this release.
+- Aider wrote 60% of the code in this release.
 
 ### Aider v0.52.1
 
diff --git a/aider/website/assets/sample.aider.conf.yml b/aider/website/assets/sample.aider.conf.yml
index fb21d150d..c2f70f0e3 100644
--- a/aider/website/assets/sample.aider.conf.yml
+++ b/aider/website/assets/sample.aider.conf.yml
@@ -245,6 +245,9 @@
 ## Check for new aider versions on launch
 #check-update: true
 
+## Install the latest version from the main branch
+#install-main-branch: false
+
 ## Apply the changes from the given file instead of running the chat (debug)
 #apply:
 
diff --git a/aider/website/assets/sample.env b/aider/website/assets/sample.env
index e05fe5e16..917040198 100644
--- a/aider/website/assets/sample.env
+++ b/aider/website/assets/sample.env
@@ -246,6 +246,9 @@
 ## Check for new aider versions on launch
 #AIDER_CHECK_UPDATE=true
 
+## Install the latest version from the main branch
+#AIDER_INSTALL_MAIN_BRANCH=false
+
 ## Apply the changes from the given file instead of running the chat (debug)
 #AIDER_APPLY=
 
diff --git a/aider/website/docs/config/aider_conf.md b/aider/website/docs/config/aider_conf.md
index a94a249ba..8a9699cbb 100644
--- a/aider/website/docs/config/aider_conf.md
+++ b/aider/website/docs/config/aider_conf.md
@@ -284,6 +284,9 @@ cog.outl("```")
 ## Check for new aider versions on launch
 #check-update: true
 
+## Install the latest version from the main branch
+#install-main-branch: false
+
 ## Apply the changes from the given file instead of running the chat (debug)
 #apply:
 
diff --git a/aider/website/docs/config/dotenv.md b/aider/website/docs/config/dotenv.md
index 805e34d62..ae348d407 100644
--- a/aider/website/docs/config/dotenv.md
+++ b/aider/website/docs/config/dotenv.md
@@ -288,6 +288,9 @@ cog.outl("```")
 ## Check for new aider versions on launch
 #AIDER_CHECK_UPDATE=true
 
+## Install the latest version from the main branch
+#AIDER_INSTALL_MAIN_BRANCH=false
+
 ## Apply the changes from the given file instead of running the chat (debug)
 #AIDER_APPLY=
 
diff --git a/aider/website/docs/config/options.md b/aider/website/docs/config/options.md
index e4995542b..848f9c239 100644
--- a/aider/website/docs/config/options.md
+++ b/aider/website/docs/config/options.md
@@ -57,9 +57,10 @@ usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model]
              [--test-cmd] [--auto-test | --no-auto-test] [--test]
              [--file] [--read] [--vim] [--voice-language]
              [--version] [--just-check-update]
-             [--check-update | --no-check-update] [--apply] [--yes]
-             [-v] [--show-repo-map] [--show-prompts] [--exit]
-             [--message] [--message-file] [--encoding] [-c] [--gui]
+             [--check-update | --no-check-update]
+             [--install-main-branch] [--apply] [--yes] [-v]
+             [--show-repo-map] [--show-prompts] [--exit] [--message]
+             [--message-file] [--encoding] [-c] [--gui]
 
 ```
 
@@ -472,6 +473,11 @@ Aliases:
   - `--check-update`
   - `--no-check-update`
 
+### `--install-main-branch`
+Install the latest version from the main branch  
+Default: False  
+Environment variable: `AIDER_INSTALL_MAIN_BRANCH`  
+
 ### `--apply FILE`
 Apply the changes from the given file instead of running the chat (debug)  
 Environment variable: `AIDER_APPLY`  
diff --git a/aider/website/docs/usage/conventions.md b/aider/website/docs/usage/conventions.md
index c20777931..4d5638330 100644
--- a/aider/website/docs/usage/conventions.md
+++ b/aider/website/docs/usage/conventions.md
@@ -21,10 +21,29 @@ For example, say we want our python code to:
 
 We would simply create a file like `CONVENTIONS.md` with those lines
 and then we can add it to the aider chat, along with the file(s)
-that we want to edit:
+that we want to edit.
+
+It's best to load the conventions file with `/read CONVENTIONS.md` 
+or `aider --read CONVENTIONS.md`. 
+This way it is marked as read-only, and cached if prompt caching
+is enabled.
+
+You can also configure aider to always load your conventions file
+in the [`.aider.conf.yml` config file](https://aider.chat/docs/config/aider_conf.html):
+
+See below for an example of how the conventions can affect the code
+that aider writes.
+
+```yaml
+# alone
+read: CONVENTIONS.md
+
+# multiple files
+read: [CONVENTIONS.md, anotherfile.txt]
+```
 
 <div class="chat-transcript" markdown="1">
-> $ aider CONVENTIONS.md useragent.py  
+> $ aider --read CONVENTIONS.md useragent.py  
 >  
 > Aider v0.24.2-dev  
 > Added CONVENTIONS.md to the chat.  
@@ -85,3 +104,5 @@ which is perhaps more typical in small python scripts.
 
 > Applied edit to useragent.py  
 </div>
+
+