diff --git a/README.md b/README.md
index d034240..34ca225 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 # HTV
 A live media player app（手机、电视直播软件）