diff --git a/README.md b/README.md
index 1b0830c..c12fc0b 100644
--- a/README.md
+++ b/README.md
@@ -180,7 +180,6 @@ Demo video link: https://b23.tv/QuB77m
 
 Bug report: http://118.25.96.118/bugzilla/show_bug.cgi?id=215
 
-<<<<<<< HEAD
 
 
 ### 丁锐