diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index def943dcb8ef1054064ffdf506ab879b7b76677b..f78af132bb8cbe98198dc1ed6161a784ae3cdc63 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -1559,7 +1559,6 @@ border-radius:8px;
   color: #d75138;
 }
 
-<<<<<<< HEAD
 .register_btn {
   background-color: #eff2fa;
   border-radius: 4px;
@@ -1578,7 +1577,6 @@ border-radius:8px;
   padding: 20px;
 }
 
-=======
 .tip-image {
   position: absolute;
   right: -24px;
@@ -1589,4 +1587,3 @@ border-radius:8px;
   background-image: url("../imgs/ic_tips.png");
   background-size: contain;
 }
->>>>>>> a152210490b057d5d9be08d415be67274b954aaf