fixed subscribe-btn

public/style/style.css

@@ -241,15 +241,13 @@ button.clearButton {
     float: right;
   }
 }
-<<<<<<< HEAD
 #subscribe-btn {
   float: right;
   visibility: hidden;
 }
 #escape-search-link {
   visibility: hidden;
-=======
+}
 #bockmark-not-active {
   visibility: visible;
->>>>>>> origin/developer
 }

public/style/style.less

@@ -291,7 +291,7 @@ button.clearButton{
 }
 #escape-search-link{
 	visibility: hidden;
-
+}
 #bockmark-not-active{
     visibility: visible;
 }