diff --git a/ChangeLog b/ChangeLog
index f120b5a1a..58e312226 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,7 +97,11 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #869006 [structure] Ignore number of records for MRG_MyISAM tables
 - bug [browse] "Show BLOB contents" should display HTML code that is present
   in a BLOB, thanks to Vincent van der Tuin
+<<<<<<< HEAD
 - [privileges] Improve escaping of hostname
+=======
+- [privileges] Improve Proper escaping of hostname
+>>>>>>> origin/MAINT_3_3_0
 
 3.2.4.0 (2009-12-02)
 - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status