diff --git a/ChangeLog b/ChangeLog
index 65cc3fc3b..e6d58d9b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,26 +8,6 @@
 
 2007-02-12  David Turner  <david@freetype.org>
 
-	* src/autofit/aflatin.c: slight optimization of the segment linker
-	and better handling of serif segments to get rid of broken "9" in
-	Arial 9 pts (96dpi)
-
-	* src/autofit/afloader.c: improve spacing adjustments for the
-	non-light auto-hinted modes. Gets rid of "inter-letter spacing
-	is too wide"
-
-	* src/truetype/ttinterp.h, src/truetype/ttinterp.c: simplify
-	projection and dual-projection code interface
-
-	* include/freetype/internal/ftmemory.h, src/base/ftutils.c,
-	src/bfd/bfddrivr.c, src/bdf/bdflib.c, src/pcf/pcfread.c,
-	src/cff/cffdrivr.c, src/cff/cffload.c, src/cff/cffobjs.c,
-	src/sfnt/sfdriver.c, src/type1/t1driver.c, src/type42/t42drivr.c:
-	introduce ft_mem_strdup, ft_mem_dup, ft_mem_strcpyn and the
-	corresponding macros, and modify code to use them. This is to
-	get rid of various uses of strcpy and other "evil" functions,
-	as well as simplify a few things
-
 	* src/truetype/ttinterp.h (TT_Project_Func): Use `FT_Pos', not
 	FT_Vector' as argument type.
 	* src/truetype/ttinterp.c (CUR_Func_project, CUR_Func_dualproj):
@@ -42,6 +22,10 @@
 	adjustments for the non-light auto-hinted modes.  Gets rid of
 	`inter-letter spacing is too wide' problems.
 
+	* src/autofit/aflatin.c: Slight optimization of the segment linker
+	and better handling of serif segments to get rid of broken `9' in
+	Arial at 9pt (96dpi).
+
 
 	Introduce new string functions and the corresponding macros to get
 	rid of various uses of strcpy and other `evil' functions, as well as
@@ -62,7 +46,6 @@
 	src/sfnt/sfdriver.c (sfnt_get_glyph_name), src/type1/t1driver.c
 	(t1_get_glyph_name), src/type42/t42drivr.c (t42_get_glyph_name,
 	t42_get_name_index): Use new functions and simplify code.
->>>>>>> 1.1522
 
 	* builds/mac/ftmac.c (FT_FSPathMakeSpec): Don't use FT_MIN.