address merge error

diff --git a/README.md b/README.md
index c95302dd2353406a1064a707177674ac64a1515f..30765904e2e519d0cc789b89fd6968e0f9713683 100644 (file)
--- a/README.md
+++ b/README.md
@@ -277,15 +277,9 @@ CVE-2017-3137, and CVE-2017-3138.
 
 #### BIND 9.10.6
 
-<<<<<<< HEAD
-BIND 9.10.6 is a maintenance release, and addresses the security flaws
-disclosed in CVE-2017-3140 and CVE-2017-3141.
-=======
-BIND 9.11.2 is a maintenance release, and addresses the security flaws
-disclosed in CVE-2017-3140, CVE-2017-3141, CVE-2017-3142 and CVE-2017-3143.
-It also addresses several bugs related to the use of an LMDB database to
-store data related to zones added via `rndc addzone` or catalog zones.
->>>>>>> a03f4b1... [v9_11] address TSIG bypass/forgery vulnerabilities
+BIND 9.10.6 is a maintenance release, and addresses the security
+flaws disclosed in CVE-2017-3140 and CVE-2017-3141, CVE-2017-3142
+and CVE-2017-3143.
 
 ### <a name="build"/> Building BIND