diff --git a/app/static/js/fillword.js b/app/static/js/fillword.js
index 573bb12..c646e1b 100644
--- a/app/static/js/fillword.js
+++ b/app/static/js/fillword.js
@@ -2,6 +2,7 @@ var isRead = true;
 var isChoose = true;
 const reader = window.speechSynthesis; // 全局定义朗读者，以便朗读和暂停
 //获取字符
+<<<<<<< HEAD
 function getWord() {
   return window.getSelection
     ? window.getSelection()
@@ -42,3 +43,37 @@ function onChooseClick() {
 function stopRead() {
   reader.cancel();
 }
+=======
+function getWord(){
+   return window.getSelection?window.getSelection():document.selection.createRange().text;
+}
+//填充字符
+function fillingWord(){
+   let word = getWord();
+   if (isRead) read(word);
+   if (!isChoose) return;
+   let element = document.getElementById("selected-words");
+   element.value = element.value + " " + word;
+}
+document.getElementById("text-content").addEventListener("click", fillingWord, false);
+//朗读单词
+//@word 要朗读的单词
+function read(word){
+   //关闭当前正在读的单词
+   reader.cancel()
+   //创建新的朗读任务
+   let msg = new SpeechSynthesisUtterance(word);
+   reader.speak(msg);
+}
+//关闭正在读的单词
+function onReadClick(){
+    let isRead = !isRead;
+    if(!isRead){
+       reader.cancel();
+    }
+}
+//取消当前选择
+function onChooseClick(){
+    isChoose = !isChoose;
+}
+>>>>>>> 72e23f4e13a8ee98628529dbfc2e21c339757015