diff --git a/elegantbook-cn.tex b/elegantbook-cn.tex
index 40ee843..728e69f 100644
--- a/elegantbook-cn.tex
+++ b/elegantbook-cn.tex
@@ -1,8 +1,4 @@
 \documentclass[lang=cn,10pt]{elegantbook}
-<<<<<<< HEAD
-=======
-
->>>>>>> 7f1dedd79f9abc217ad4d62ac36c6ca3fd8eecc0
 
 \title{ElegantBook：优美的 \LaTeX{} 书籍模板}
 \subtitle{Elegant\LaTeX{} 经典之作}