add TOC to SANDBOX, fix merge conflicts

README.md

···
 ```bash
 sudo pdsadmin update
 ```
+<<<<<<< HEAD
+=======
+
+**Restart PDS with the new container image:**
+```bash
+sudo systemctl restart pds
+```
+
+## PDS environment variables
+
+You will need to customize various settings configured through the PDS environment variables. See the below table to find the variables you'll need to set.
+
+| Environment Variable                      | Value                        | Should update? | Notes                                                                       |
+| ----------------------------------------- | ---------------------------- | -------------- | --------------------------------------------------------------------------- |
+| PDS_HOSTNAME                              | example.com                  | ✅              | Public domain you intend to deploy your service at                          |
+| PDS_JWT_SECRET                            | jwt-secret                   | ✅              | Use a secure high-entropy string that is 32 characters in length            |
+| PDS_ADMIN_PASSWORD                        | admin-pass                   | ✅              | Use a secure high-entropy string that is 32 characters in length            |
+| PDS_REPO_SIGNING_KEY_K256_PRIVATE_KEY_HEX | 3ee68...                     | ✅              | See above Generate Keys section - once set, do not change                   |
+| PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX | e049f...                     | ✅              | See above Generate Keys section - once set, do not change                   |
+| PDS_DB_SQLITE_LOCATION                    | /pds/pds.sqlite              | ❌              | Or use `PDS_DB_POSTGRES_URL` depending on which database you intend to use  |
+| PDS_BLOBSTORE_DISK_LOCATION               | /pds/blocks                  | ❌              | Only update if you update the mounted volume for your docker image as well  |
+| PDS_DID_PLC_URL                           | https://plc.bsky-sandbox.dev | ❌              | Do not adjust if you intend to federate with the Bluesky federation sandbox |
+| PDS_BSKY_APP_VIEW_URL                     | https://api.bsky-sandbox.dev | ❌              | Do not adjust if you intend to federate with the Bluesky federation sandbox |
+| PDS_BSKY_APP_VIEW_DID                     | did:web:api.bsky-sandbox.dev | ❌              | Do not adjust if you intend to federate with the Bluesky federation sandbox |
+| PDS_CRAWLERS                              | https://bgs.bsky-sandbox.dev | ❌              | Do not adjust if you intend to federate with the Bluesky federation sandbox |
+
+There are additional environment variables that can be tweaked depending on how you're running your service. For instance, storing blobs in AWS S3, keys in AWS KMS, or setting up an email service.
+
+Feel free to explore those [Here](https://github.com/bluesky-social/atproto/blob/main/packages/pds/src/config/env.ts). However, we will not be providing support for more advanced configurations.
+>>>>>>> 230720873dba8b6b8ed4d3d1ebf004fd48a4d974

SANDBOX.md

···
 
 Given that this is a testing environment, we will be defederating from any instances that do not abide by these guidelines, or that cause unnecessary trouble, and will not be providing specific justifications for these decisions.
 
+<!-- markdown-toc -i SANDBOX.md -->
+
+<!-- toc -->
+
+- [Guidelines that must be followed](#guidelines-that-must-be-followed)
+  * [Post responsibly](#post-responsibly)
+  * [Keep the emphasis on testing](#keep-the-emphasis-on-testing)
+  * [Do limit account creation](#do-limit-account-creation)
+  * [Don’t expect persistence or uptime](#dont-expect-persistence-or-uptime)
+  * [Don't advertise your service as being "Bluesky"](#dont-advertise-your-service-as-being-bluesky)
+  * [Do not mirror sandbox did:plcs to production](#do-not-mirror-sandbox-didplcs-to-production)
+  * [Status and Wipes](#status-and-wipes)
+    + [🐉 Beware of dragons!](#%F0%9F%90%89-beware-of-dragons)
+    + [Routine wipes](#routine-wipes)
+- [Getting started](#getting-started)
+  * [Auto-updates](#auto-updates)
+  * [Odds & Ends & Warnings & Reminders](#odds--ends--warnings--reminders)
+- [Learn more about atproto federation](#learn-more-about-atproto-federation)
+  * [Network Services](#network-services)
+    + [PLC](#plc)
+    + [BGS](#bgs)
+    + [Bluesky App View](#bluesky-app-view)
+- [The PDS](#the-pds)
+
+<!-- tocstop -->
+
 # Guidelines that must be followed
 
 Using the sandbox environment means you agree to adhere to our Guidelines. Please read the following carefully:
···
 
 The sandbox environment is intended to test infrastructure, but user content may be created as part of this testing process. Content generation can be automated or manual.
 
-Do not post content that requires active moderation or violates the [Bluesky Community Guidelines](https://blueskyweb.xyz/support/community-guidelines).
+Do not post content that requires active moderation or violates the [Bluesky Community Guidelines](https://bsky.social/about/support/community-guidelines).
 
 ## Keep the emphasis on testing
 
···
 
 # Learn more about atproto federation
 
-Check out the [high-level view of federation](https://blueskyweb.xyz/blog/5-5-2023-federation-architecture).
+Check out the [high-level view of federation](https://bsky.social/about/blog/5-5-2023-federation-architecture).
 
 Dive deeper with the [atproto docs](https://atproto.com/docs).
 
···
 
 We’re not actually running a Bluesky PDS in sandbox. You might see Bluesky team members' accounts in the sandbox environment, but those are self-hosted too.
 
-The PDS that you’ll be running is much of the same code that is running on the Bluesky production PDS. Notably, all of the in-pds-appview code has been torn out. You can see the actual PDS code that you’re running on the [atproto/simplify-pds](https://github.com/bluesky-social/atproto/pull/1198) branch.
+The PDS that you’ll be running is much of the same code that is running on the Bluesky production PDS. Notably, all of the in-pds-appview code has been torn out. You can see the actual PDS code that you’re running on the [atproto/simplify-pds](https://github.com/bluesky-social/atproto/pull/1198) branch.