diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
old mode 100644
new mode 100755
index 220e7bf..c19924b
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -23,37 +23,10 @@
     <title>EnglishPal Study Room for {{ username }}</title>
 
     <style>
-      .shaking {
-          animation: shakes 1600ms ease-in-out;
-      }
+        .shaking {
+            animation: shakes 1600ms ease-in-out;
+        }
 
-      @keyframes shakes {
-          10%, 90% { transform: translate3d(-1px, 0, 0); }
-          20%, 50% { transform: translate3d(+2px, 0, 0); }
-          30%, 70% { transform: translate3d(-4px, 0, 0); }
-          40%, 60% { transform: translate3d(+4px, 0, 0); }
-          50% { transform: translate3d(-4px, 0, 0); }
-      }
-
-      .lead{
-          font-size: 22px;
-          font-family: Helvetica, sans-serif;
-          white-space: pre-wrap;
-      }
-
-      .arrow {
-	  padding: 0;
-	  font-size: 20px;
-	  line-height: 21px;
-	  display: inline-block;
-      }
-
-      .arrow:hover {
-	  cursor: pointer;
-      }
-
-<<<<<<< HEAD
-=======
         @keyframes shakes {
             10%, 90% {
                 transform: translate3d(-1px, 0, 0);
@@ -89,7 +62,6 @@
             cursor: pointer;
         }
 
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
     </style>
 </head>
 <body>
@@ -104,16 +76,6 @@
 
     </p>
     {% for message in get_flashed_messages() %}
-<<<<<<< HEAD
-    <div class="alert alert-warning alert-dismissible fade show" role="alert">
-	{{ message }}
-	<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-    </div>
-    {% endfor %}
-
-        <button class="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()" title="下一篇 Next Article">⇨</button>
-        <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none" title="上一篇 Previous Article">⇦</button>
-=======
         <div class="alert alert-warning alert-dismissible fade show" role="alert">
             {{ message }}
             <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
@@ -126,23 +88,10 @@
     <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none"
             title="上一篇 Previous Article">⇦
     </button>
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
 
     <p><b>阅读文章并回答问题</b></p>
     <div id="text-content">
         <div id="found">
-<<<<<<< HEAD
-            <div class="alert alert-success" role="alert">According to your word list, your level is <span class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span>  and we have chosen an article with a difficulty level of <span class="text-decoration-underline" id="text_level">{{ today_article["text_level"] }}</span> for you.</div>
-                <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
-            <div class="p-3 mb-2 bg-light text-dark" style="margin: 0 0.5%;"><br/>
-            <p class="display-6" id="article_title">{{ today_article["article_title"] }}</p><br/>
-            <p class="lead"><font id="article">{{ today_article["article_body"] }}</font></p><br/>
-            <div>
-                <p><small class="text-muted" id="source">{{ today_article['source'] }}</small></p><br/>
-            </div>
-            
-            <p><b id="question">{{ today_article['question'] }}</b></p><br/>
-=======
             <div class="alert alert-success" role="alert">According to your word list, your level is <span
                     class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span> and we
                 have chosen an article with a difficulty level of <span class="text-decoration-underline"
@@ -158,7 +107,6 @@
                 </div>
 
                 <p><b id="question">{{ today_article['question'] }}</b></p><br/>
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
                 <script type="text/javascript">
                     function toggle_visibility(id) { {# https://css-tricks.com/snippets/javascript/showhide-element/#}
                         const e = document.getElementById(id);
@@ -197,11 +145,7 @@
     <form method="post" action="/{{ username }}/userpage">
         <textarea name="content" id="selected-words" rows="10" cols="120"></textarea><br/>
         <button class="btn btn-primary btn-lg" type="submit" onclick="Reader.stopRead()">把生词加入我的生词库</button>
-<<<<<<< HEAD
-        <button class="btn btn-primary btn-lg" type="reset">清除</button>
-=======
         <button class="btn btn-primary btn-lg" type="reset" onclick="clearSelectedWords()">清除</button>
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
     </form>
     {% if session.get['thisWord'] %}
         <script type="text/javascript">
@@ -252,14 +196,6 @@
 {% endif %}
 <script type="text/javascript">
     window.onload = function () { // 页面加载时执行
-<<<<<<< HEAD
-        // 刷新页面或进入页面时判断，若不是首篇文章，则上一篇按钮可见
-        if(sessionStorage.getItem('pre_page_button')!="display" && sessionStorage.getItem('pre_page_button')){
-            $('#load_pre_article').show();
-        }
-     };
-    function load_next_article(){
-=======
         const settings = {
             // initialize settings from localStorage
             highlightChecked: localStorage.getItem('highlightChecked') !== 'false', // localStorage stores strings, default to true. same below
@@ -310,7 +246,6 @@
 
     function load_next_article() {
         $("#load_next_article").prop("disabled", true)
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
         $.ajax({
             url: '/get_next_article/{{username}}',
             dataType: 'json',
@@ -340,12 +275,8 @@
             }
         });
     }
-<<<<<<< HEAD
-    function update(today_article){
-=======
 
     function update(today_article) {
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
         $('#user_level').html(today_article['user_level']);
         $('#text_level').html(today_article["text_level"]);
         $('#date').html('Article added on: ' + today_article["date"]);
@@ -355,11 +286,6 @@
         $('#question').html(today_article["question"]);
         $('#answer').html(today_article["answer"]);
         document.querySelector('#text_level').classList.add('mark'); // highlight text difficult level for 2 seconds
-<<<<<<< HEAD
-        setTimeout(() => {document.querySelector('#text_level').classList.remove('mark');}, 2000);
-        document.querySelector('#user_level').classList.add('mark'); // do the same thing for user difficulty level
-        setTimeout(() => {document.querySelector('#user_level').classList.remove('mark');}, 2000);
-=======
         setTimeout(() => {
             document.querySelector('#text_level').classList.remove('mark');
         }, 2000);
@@ -367,7 +293,6 @@
         setTimeout(() => {
             document.querySelector('#user_level').classList.remove('mark');
         }, 2000);
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
     }
 
     <!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
@@ -375,11 +300,7 @@
         if ((visited_articles == '') || (visited_articles['index'] <= 0)) {
             $('#load_pre_article').hide();
             sessionStorage.setItem('pre_page_button', 'display')
-<<<<<<< HEAD
-        }else{
-=======
         } else {
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
             $('#load_pre_article').show();
             sessionStorage.setItem('pre_page_button', 'show')
         }
@@ -410,3 +331,4 @@
 </style>
 
 </html>
+
