diff --git a/fcitx.spec b/fcitx.spec
index fd7b470..cb96d96 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -305,7 +305,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 
 %changelog
-<<<<<<< HEAD
 * Thu Jun 07 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.4-2.1
 - Disable GIR Binding on Fedora 16