diff --git a/Changes b/Changes
index 64cfa97..0c626cf 100644
--- a/Changes
+++ b/Changes
@@ -112,7 +112,7 @@ Bug fixes:
 - PR#4564: add note "stack is not executable" to object files generated by
   ocamlopt (Linux/x86, Linux/AMD64).
 - PR#4566: bug in Ratio.approx_ratio_fix and Num.approx_num_fix.
-- PR#4582: weird behaviour of String.index_from and String.rindex_from.
+* PR#4582: weird behaviour of String.index_from and String.rindex_from.
 - PR#4583: stack overflow in "ocamlopt -g" during closure conversion pass.
 - PR#4585: ocamldoc and "val virtual" declarations.
 - PR#4587: ocamldoc and escaped @ characters.
@@ -2378,12 +2378,4 @@ Caml Special Light 1.06:

 * First public release.

-<<<<<<< Changes
-<<<<<<< Changes
-$Id: Changes,v 1.183.2.1 2008/10/15 13:12:58 doligez Exp $
-=======
-$Id: Changes,v 1.183.2.1 2008/10/15 13:12:58 doligez Exp $
->>>>>>> 1.168.2.7
-=======
-$Id: Changes,v 1.183.2.1 2008/10/15 13:12:58 doligez Exp $
->>>>>>> 1.168.2.13
+$Id$