diff --git a/README.md b/README.md
index 804eb45..1e1f69b 100644
--- a/README.md
+++ b/README.md
@@ -79,9 +79,9 @@ best. We can perform quick experiments to measure performance after making chang
    pnpm dev
    ```
 
-   Then open your browser and go to the [http://localhost:3000/](demo site).
+   Then open your browser and go to the [http://localhost:3000/](demo site): http://localhost:3000/
 
-   Setup for Step 0 is complete after this step.
+   Setup for Step 0 (baseline site with manual processing) is complete after this step.
 
 3. **(Optional) Enable Weave Tracing**
 
@@ -119,23 +119,7 @@ best. We can perform quick experiments to measure performance after making chang
 
    Then restart the local webserver with `pnpm dev`.
 
-5. **Start the local webserver**
-   TODO: replace with pnpm run_demo
-   TODO: make run_demo do the runloop agent setup too
-
-   ```bash
-   pnpm dev
-   ```
-
-   Set up Runloop resources for this demo and start the local tax prep web server.
-
-6. **Open demo application**
-   - **Demo Dashboard**: http://localhost:3000
-
-   TODO: list things to look at:
-   - eg: http://localhost:3000/stepN/ to see various steps
-   - eg: runloop dashboard w/ created artifacts
-   - eg: benchmark scenario runs
+   Now check out the demo dashboard again for [step 1](http://localhost:3000/step1) to see it in action.
 
 ## License
 
diff --git a/docs/step1/README.md b/docs/step1/README.md
index 20ea915..234274a 100644
--- a/docs/step1/README.md
+++ b/docs/step1/README.md
@@ -28,7 +28,12 @@ Step 1 largely reuses code from our original implementation: reading PDFs, parsi
 - **API endpoint**:
   You can walk through the streaming API route that orchestrates the entire processing flow:
 
+<<<<<<< HEAD
+  ```ts
+  84:238:packages/frontend/src/app/api/tax/process-step1-stream/route.ts
+=======
   ```84:238:packages/frontend/src/app/api/tax/process-step1-stream/route.ts
+>>>>>>> main
   // Handles file upload, creates devbox, runs agent, generates PDF
   // Returns Server-Sent Events for real-time progress updates
   ```
@@ -36,7 +41,8 @@ Step 1 largely reuses code from our original implementation: reading PDFs, parsi
 - **Devbox creation and agent execution**:
   The API endpoint creates an instance of `TaxService` then calls `processTaxReturn`. In turn, this spins up the Runloop devbox, uploads files, and executes the agent:
 
-  ```70:178:packages/frontend/src/lib/tax-processing-service.ts
+  ```ts
+  70:178:packages/frontend/src/lib/tax-processing-service.ts
   // Creates devbox from blueprint, uploads W-2 file and agent prompt,
   // executes the agent via execAsync, and retrieves the JSON result
   ```
@@ -80,7 +86,12 @@ Step 1 largely reuses code from our original implementation: reading PDFs, parsi
 - **Agent execution script**:
   After setting up the evironment, we invoke the agent using a standalone script that runs on the devbox to process the W-2 and generate Form 1040 JSON:
 
+<<<<<<< HEAD
+  ```ts
+  11:97:packages/tax-processing/src/bin/run-agent-turn.ts
+=======
   ```11:97:packages/tax-processing/src/bin/run-agent-turn.ts
+>>>>>>> main
   // Runs a single agent turn using CodexService to process W-2
   // and write Form 1040 JSON output to the specified file
   ```
@@ -102,7 +113,8 @@ Step 1 largely reuses code from our original implementation: reading PDFs, parsi
 - **PDF generation**:
   After processing the input, the final step is to generate the 1040 PDF form:
 
-  ```29:50:packages/frontend/src/lib/pdf-generator.ts
+  ```ts
+  29:50:packages/frontend/src/lib/pdf-generator.ts
   // Loads IRS Form 1040 template, fills form fields with agent output,
   // and saves the completed PDF to the output directory
   ```