diff --git a/note.html b/note.html
index 3dc25730..4435ee75 100755
--- a/note.html
+++ b/note.html
@@ -790,7 +790,7 @@ window.require = undefined;
 <script src="public/tinymce/tinymce.dev.js"></script>
 <script src="public/libs/ace/ace.js"></script>
 <script src="public/js/app/page.js"></script>
-<script src="public/js/jQuery-slimScroll-1.3.0/jquery.slimscroll.js"></script>
+<!-- <script src="public/js/jQuery-slimScroll-1.3.0/jquery.slimscroll.js"></script> -->
 <script src="public/js/contextmenu/jquery.contextmenu.js"></script>
 <script src="public/js/bootstrap-min.js"></script>
 <script src="public/js/app/note.js"></script>
diff --git a/public/css/theme/basic.less b/public/css/theme/basic.less
index 00f2c670..5f1e41c7 100644
--- a/public/css/theme/basic.less
+++ b/public/css/theme/basic.less
@@ -992,7 +992,7 @@ h1, h2, h3 {
   right:0;
   bottom: 0;
   width: 100%;
-  overflow-y: hidden;
+  overflow-y: scroll;
   padding: 0 5px;
 }
 #noteItemList .item {
@@ -1512,3 +1512,35 @@ top: 4px;
 	text-decoration: underline;
 	white-space: nowrap;text-overflow:ellipsis; overflow:hidden;
 }
+
+// scrollbar style TODO
+// https://www.webkit.org/blog/363/styling-scrollbars/
+// http://trac.webkit.org/export/41842/trunk/LayoutTests/scrollbars/overflow-scrollbar-combinations.html
+
+
+/*
+ *  STYLE 2
+ */
+/*
+*::-webkit-scrollbar-track
+{
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+	border-radius: 10px;
+	background-color: #F5F5F5;
+}
+
+*::-webkit-scrollbar
+{
+	width: 10px;
+	background-color: #F5F5F5;
+	position: absolute;
+	-webkit-transform: translatez(0);
+}
+
+*::-webkit-scrollbar-thumb
+{
+	border-radius: 10px;
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+	background-color: #D62929;
+}
+*/
diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index b17e364c..9b2374fa 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -913,7 +913,7 @@ h3 {
   right: 0;
   bottom: 0;
   width: 100%;
-  overflow-y: hidden;
+  overflow-y: scroll;
   padding: 0 5px;
 }
 #noteItemList .item {
@@ -1362,6 +1362,39 @@ h3 {
   width: 230px;
   height: 80px;
 }
+.conflict-title {
+  display: block;
+  text-decoration: underline;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+/*
+ *  STYLE 2
+ */
+/*
+*::-webkit-scrollbar-track
+{
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+	border-radius: 10px;
+	background-color: #F5F5F5;
+}
+
+*::-webkit-scrollbar
+{
+	width: 10px;
+	background-color: #F5F5F5;
+	position: absolute;
+	-webkit-transform: translatez(0);
+}
+
+*::-webkit-scrollbar-thumb
+{
+	border-radius: 10px;
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+	background-color: #D62929;
+}
+*/
 ::selection {
   background: #000000;
   color: #ffffff;
diff --git a/public/css/theme/simple.css b/public/css/theme/simple.css
index be0f4a36..83dbe73f 100644
--- a/public/css/theme/simple.css
+++ b/public/css/theme/simple.css
@@ -913,7 +913,7 @@ h3 {
   right: 0;
   bottom: 0;
   width: 100%;
-  overflow-y: hidden;
+  overflow-y: scroll;
   padding: 0 5px;
 }
 #noteItemList .item {
@@ -1362,6 +1362,39 @@ h3 {
   width: 230px;
   height: 80px;
 }
+.conflict-title {
+  display: block;
+  text-decoration: underline;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+/*
+ *  STYLE 2
+ */
+/*
+*::-webkit-scrollbar-track
+{
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+	border-radius: 10px;
+	background-color: #F5F5F5;
+}
+
+*::-webkit-scrollbar
+{
+	width: 10px;
+	background-color: #F5F5F5;
+	position: absolute;
+	-webkit-transform: translatez(0);
+}
+
+*::-webkit-scrollbar-thumb
+{
+	border-radius: 10px;
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+	background-color: #D62929;
+}
+*/
 ::selection {
   background: #000000;
   color: #ffffff;
diff --git a/public/css/theme/writting-overwrite.css b/public/css/theme/writting-overwrite.css
index 116b7c6d..bacafdc7 100644
--- a/public/css/theme/writting-overwrite.css
+++ b/public/css/theme/writting-overwrite.css
@@ -913,7 +913,7 @@ h3 {
   right: 0;
   bottom: 0;
   width: 100%;
-  overflow-y: hidden;
+  overflow-y: scroll;
   padding: 0 5px;
 }
 #noteItemList .item {
@@ -1362,6 +1362,39 @@ h3 {
   width: 230px;
   height: 80px;
 }
+.conflict-title {
+  display: block;
+  text-decoration: underline;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+/*
+ *  STYLE 2
+ */
+/*
+*::-webkit-scrollbar-track
+{
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+	border-radius: 10px;
+	background-color: #F5F5F5;
+}
+
+*::-webkit-scrollbar
+{
+	width: 10px;
+	background-color: #F5F5F5;
+	position: absolute;
+	-webkit-transform: translatez(0);
+}
+
+*::-webkit-scrollbar-thumb
+{
+	border-radius: 10px;
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+	background-color: #D62929;
+}
+*/
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
diff --git a/public/css/theme/writting.css b/public/css/theme/writting.css
index 7425df04..be5f3cfb 100644
--- a/public/css/theme/writting.css
+++ b/public/css/theme/writting.css
@@ -913,7 +913,7 @@ h3 {
   right: 0;
   bottom: 0;
   width: 100%;
-  overflow-y: hidden;
+  overflow-y: scroll;
   padding: 0 5px;
 }
 #noteItemList .item {
@@ -1362,6 +1362,39 @@ h3 {
   width: 230px;
   height: 80px;
 }
+.conflict-title {
+  display: block;
+  text-decoration: underline;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+/*
+ *  STYLE 2
+ */
+/*
+*::-webkit-scrollbar-track
+{
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+	border-radius: 10px;
+	background-color: #F5F5F5;
+}
+
+*::-webkit-scrollbar
+{
+	width: 10px;
+	background-color: #F5F5F5;
+	position: absolute;
+	-webkit-transform: translatez(0);
+}
+
+*::-webkit-scrollbar-thumb
+{
+	border-radius: 10px;
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+	background-color: #D62929;
+}
+*/
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
diff --git a/public/js/app/note.js b/public/js/app/note.js
index cffbde86..28398f1b 100644
--- a/public/js/app/note.js
+++ b/public/js/app/note.js
@@ -815,7 +815,8 @@ Note.renderNotes = function(notes, forNewNote, isShared) {
 	// 手机端不用
 	// slimScroll使得手机端滚动不流畅
 	if(!LEA.isMobile && !Mobile.isMobile()) {
-		$("#noteItemList").slimScroll({ scrollTo: '0px', height: "100%", onlyScrollBar: true});
+		// $("#noteItemList").slimScroll({ scrollTo: '0px', height: "100%", onlyScrollBar: true});
+		$("#noteItemList").scrollTop(0); // ({ scrollTo: '0px', height: "100%", onlyScrollBar: true});
 	}
 	
 	if(!notes || typeof notes != "object" || notes.length <= 0) {