diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 58b1f79ed6..ffcd50e9e0 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1399,7 +1399,6 @@
 
         * Add magnifier to entry.
 
-<<<<<<< HEAD
 2013-06-10  ChunEon Park (Hermet)
 
         * Remove the keyboard area in the conformant if the keyboard state is off.