diff --git a/README.md b/README.md
index fb8f987..8353095 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Flexbox Playground   
 CSS3 FlexBox 在线调试：   
 https://www.qtyyw.com/