diff --git a/ChangeLog b/ChangeLog
index 28078ebca8..dc56ef6871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,6 @@
 phpMyAdmin - ChangeLog
 ======================
 
-<<<<<<< HEAD
 4.1.0.0 (not yet released)
 + rfe #499 On user creation, warn if the user already exists
 + Use indeterminate check all checkbox in server privileges