diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2eae948d6..a5eb9132f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -55,7 +55,6 @@
           involving Udev. Closes ticket #1818.</para>
         </listitem>
         <listitem>
->>>>>>> .r7663
           <para>[bdubbs] - Updated udev-config and bootscripts download
           location.</para>
         </listitem>