From b20b5b8b9466e6929a881302fc55575bb0fe051b Mon Sep 17 00:00:00 2001
From: Andrew Wilkins <axw@elastic.co>
Date: Wed, 28 Jul 2021 10:01:52 +0800
Subject: [PATCH] fix merge conflict

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 5764edb263b..ddd4a9235e4 100644
--- a/README.md
+++ b/README.md
@@ -17,11 +17,7 @@ To get started with APM please see our [Getting Started Guide](https://www.elast
 
 ### Requirements
 
-<<<<<<< HEAD
-* [Golang](https://golang.org/dl/) 1.16.5
-=======
 * [Golang](https://golang.org/dl/) 1.16.x
->>>>>>> bcd5bb6a (chore: update-beats goal to bump the go version (#5778))
 
 ### Install