diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog
index 1ea2f0ab8a..5ce8c3cd79 100644
--- a/c/src/lib/libbsp/powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-17	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* shared/start/start.S: Remove conflict lines in comments.
+
 2010-12-30	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* shared/uboot_dump_bdinfo.c: Include <bsp/u-boot.h> if necessary.
diff --git a/c/src/lib/libbsp/powerpc/shared/start/start.S b/c/src/lib/libbsp/powerpc/shared/start/start.S
index fadfd13ed1..dc87df70a3 100644
--- a/c/src/lib/libbsp/powerpc/shared/start/start.S
+++ b/c/src/lib/libbsp/powerpc/shared/start/start.S
@@ -7,11 +7,7 @@
  *  found in found in the file LICENSE in this distribution or at
  *  http://www.rtems.com/license/LICENSE.
  *
-<<<<<<< start.S
  *  $Id$
-=======
- *  $Id$
->>>>>>> 1.25
  *
  */