diff --git a/public/react/src/modules/testpaper/Paperlibraryeditid.js b/public/react/src/modules/testpaper/Paperlibraryeditid.js
index d22047469..454ecd171 100644
--- a/public/react/src/modules/testpaper/Paperlibraryeditid.js
+++ b/public/react/src/modules/testpaper/Paperlibraryeditid.js
@@ -178,7 +178,6 @@ class Paperlibraryeditid extends Component {
 		this.contentMdRef = Ref;
 	}
 
-<<<<<<< HEAD
 	setnewmyshixunmodelbool = (bool) => {
 		if (bool === true) {
 			let scrollToTop = window.setInterval(function () {
@@ -187,16 +186,6 @@ class Paperlibraryeditid extends Component {
 					window.scrollTo(0, pos - 20); // how far to scroll on each step
 				} else {
 					window.clearInterval(scrollToTop);
-=======
-	setnewmyshixunmodelbool=(bool)=>{
-		if(bool===true){
-			let scrollToTop = window.setInterval(function() {
-				let pos = window.pageYOffset;
-				if ( pos > 0 ) {
-					window.scrollTo( 0, pos - 20 ); // how far to scroll on each step
-				} else {
-					window.clearInterval( scrollToTop );
->>>>>>> 1036126... 合并
 				}
 			}, 2);
 		}