diff --git a/README b/README
index af0c517303..ebd44c9af5 100644
--- a/README
+++ b/README
@@ -263,14 +263,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.
 
 Building BIND
 
diff --git a/configure b/configure
index aee295b515..9b8c09e776 100755
--- a/configure
+++ b/configure
@@ -19855,8 +19855,8 @@ case "$enable_atomic" in
 		case "$host" in
 		powerpc-ibm-aix*)
 			if test "X$GCC" = "Xyes"; then
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if asm(\"isc\"); works" >&5
-$as_echo_n "checking if asm(\"isc\"); works... " >&6; }
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if asm(\"ics\"); works" >&5
+$as_echo_n "checking if asm(\"ics\"); works... " >&6; }
 				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index a44c38ad94..970e3084d3 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -173,20 +173,13 @@
   <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_bugs"></a>Bug Fixes</h3></div></div></div>
-    <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-	<p>
-	  None.
-	</p>
-      </li>
-<li class="listitem">
+    <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 	<p>
 	  Semicolons are no longer escaped when printing CAA and
 	  URI records.  This may break applications that depend on the
 	  presence of the backslash before the semicolon. [RT #45216]
 	</p>
-      </li>
-</ul></div>
+      </li></ul></div>
   </div>
 
   <div class="section">
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 24bf15ac3e..2bc5dcf78b 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -136,20 +136,13 @@
   <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_bugs"></a>Bug Fixes</h3></div></div></div>
-    <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-	<p>
-	  None.
-	</p>
-      </li>
-<li class="listitem">
+    <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 	<p>
 	  Semicolons are no longer escaped when printing CAA and
 	  URI records.  This may break applications that depend on the
 	  presence of the backslash before the semicolon. [RT #45216]
 	</p>
-      </li>
-</ul></div>
+      </li></ul></div>
   </div>
 
   <div class="section">