diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js
index 8bfd3072..e5602316 100644
--- a/src/main/webapp/js/nlib.js
+++ b/src/main/webapp/js/nlib.js
@@ -150,7 +150,6 @@ function fn_lengthBytes(s) {
 
 function fn_extractContentText(html) {
     return new DOMParser().parseFromString(html, "text/html").documentElement.textContent;
-<<<<<<< HEAD
 }
 
 function risShow(risId){
@@ -223,6 +222,4 @@ function insertInterest(masterId){
     }).done(function(result){
     	alert(result);
     });
-=======
->>>>>>> refs/remotes/origin/master
 }
\ No newline at end of file