Fix conflicts

ammario · ammario · commit 8b0cc24a29a6 · 2022-05-24T17:23:59.000-05:00
diff --git a/README.md b/README.md
@@ -8,55 +8,31 @@ Discord"](https://img.shields.io/badge/join-us%20on%20Discord-gray.svg?longCache
 Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social)](https://twitter.com/coderhq)
 [![codecov](https://codecov.io/gh/coder/coder/branch/main/graph/badge.svg?token=TNLW3OAP6G)](https://codecov.io/gh/coder/coder)
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-Team-wide CLI for spawning up dev servers on demand, powered by Terraform.
-||||||| parent of 059e6c7a (Add logos)
-Provision remote development environments with Terraform.
-=======
-Provision remote development environments anywhere on anything.
->>>>>>> 059e6c7a (Add logos)
-||||||| parent of b6574d34 (Integrate Ben's improvements)
-Provision remote development environments anywhere on anything.
-=======
 Provision remote development servers anywhere on anything.
->>>>>>> b6574d34 (Integrate Ben's improvements)
 
 ![Kubernetes workspace in Coder v2](./docs/screenshot.png)
 
-<<<<<<< HEAD
 ## Highlights
 
 Workspaces:
+
 - Code on powerful servers: leverage cloud GPU, GPU, and network speeds
 - Use the `coder` CLI: connect via SSH, VS Code, and JetBrains
 - Self-serve workspaces: start from team-wide templates (see below)
 
 Templates:
+
 - Manage the infrastructure behind workspaces with standard Terraform (`.hcl` files)
 - Use any OS and architecture: Mac, Windows, Linux, VM, Kubernetes, ARM, etc
 - Auto-shutdown or update workspaces when they're not in use!
 
-||||||| parent of b6574d34 (Integrate Ben's improvements)
-## Highlights
-
-- Automate development environments for Linux, Windows, and macOS
-- Start writing code with a single command
-- Get started quickly using one of the [examples](./examples) provided
-=======
-- Automate development environments for Linux, Windows, and macOS
-- Start writing code with a single command
-- Get started quickly using one of the [examples](./examples) provided
->>>>>>> b6574d34 (Integrate Ben's improvements)
-
 TODO: succintly list value props
 
 ## How it works
 
-Coder workspaces are represented with Terraform. But, no Terraform knowledge is
-required to get started. We have a database of pre-made templates built into
-the product. Terraform empowers you to create
-remote environments on _anything_, including:
+Coder workspaces are represented with terraform. But, no terraform knowledge is
+required to get started. We have a database of pre-made templates [here](https://github.com/coder/coder/tree/main/examples). Terraform empowers you to create
+environments on _anything_, including:
 
 - VMs across any cloud
 - Kubernetes across any cloud (AKS, EKS, GKS)
