diff --git a/README.md b/README.md
index 5819d80994..75bbf2a0a7 100644
--- a/README.md
+++ b/README.md
@@ -38,27 +38,7 @@ See [proto/README.md](proto/README.md) for more information.
 
 ## Running Locally
 
-<<<<<<< HEAD
-First step is to set up a `secrets.env` file in the root of the repo. Use the following template but fill in your own values (without quotes!):
-
-```bash
-# GitHub username
-BOSS_GH_USERNAME=<username>
-# GitHub Access token with repo scope, created at https://github.com/settings/tokens
-BOSS_GH_ACCESS_TOKEN=<access-token>
-```
-
-Then run start all backend services using `docker-compose`:
-
-```bash
-$ ./docker-compose.yaml up --build
-```
-
-And finally install all dependencies and start serving the frontend using `yarn`:
-
-=======
-
-> > > > > > > f7ec4a6... Polishes
+Once you've installed all dependencies, start serving the frontend using `yarn`:
 
 ```bash
 $ make start