diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 3ae7b3d7df..e131b3d639 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -32,7 +32,6 @@ commented out second index entry- breaks pdf - for now.</para></listitem>
 Python-2.4.</para></listitem>
 
 <listitem><para>January 5th, 2004 [igor]: Updated to GLib-2.6.0,
->>>>>>> .r3205
 Pango-1.8.0, ATK-1.9.0, libtiff-3.7.1, GTK+-2.6.0 and
 Tcl/Tk-8.4.9.</para></listitem>