diff --git a/Assets/FMOD Banks/Desktop/Environment.bank b/Assets/FMOD Banks/Desktop/Environment.bank
index 58dc2e2b3..0542cf8f8 100644
--- a/Assets/FMOD Banks/Desktop/Environment.bank	
+++ b/Assets/FMOD Banks/Desktop/Environment.bank	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5998e0dfc6078d1289987428b7cc972bb63ae89fedf27bfe8534be98dab4c9a5
-size 1759520
+oid sha256:959654fa794f6ac9d3dc66b44a331d9118bd74cd9a13769b151ddcbb0d69a9fb
+size 1765632
diff --git a/Assets/FMOD Banks/Desktop/Master.strings.bank b/Assets/FMOD Banks/Desktop/Master.strings.bank
index aa11f4cc2..453aac636 100644
--- a/Assets/FMOD Banks/Desktop/Master.strings.bank	
+++ b/Assets/FMOD Banks/Desktop/Master.strings.bank	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8ae9dcd83c20f70af4959c76eb0cc00d0f1b977125ed771eb258a22a70fe3ab
-size 5220
+oid sha256:be037160dc0e4d98a1122244d0846f30750ce7aa3af0be8d695372d3390eacc3
+size 5348
diff --git a/Assets/FMOD Banks/Desktop/VO.bank b/Assets/FMOD Banks/Desktop/VO.bank
index 9404aae16..9a34da617 100644
--- a/Assets/FMOD Banks/Desktop/VO.bank	
+++ b/Assets/FMOD Banks/Desktop/VO.bank	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43958ae161e8be839bb2a92bcf6c90ec038307128c3e57fd23682ccee3afaef6
-size 1245920
+oid sha256:ef7078594b14a64a3ffe0b38a1312c6f211a3e97a59f003df8f6b1f5ab3e5d49
+size 1249088
diff --git a/Assets/Resources/Yarn/.vscode/settings.json b/Assets/Resources/Yarn/.vscode/settings.json
new file mode 100644
index 000000000..9cd729c58
--- /dev/null
+++ b/Assets/Resources/Yarn/.vscode/settings.json
@@ -0,0 +1,16 @@
+{
+    "files.exclude": {
+        ".history": true,
+        "**/.history": true,
+        "/.history": true
+    },
+    "files.watcherExclude": {
+        "**/.history": true
+    },
+    "search.exclude": {
+        "**/.history": true
+    },
+    "explorer.autoRevealExclude": {
+        "**/.history": true
+    }
+}
\ No newline at end of file
diff --git a/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn b/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn
index 5de1293b8..0e3528492 100644
--- a/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn
+++ b/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn
@@ -228,7 +228,6 @@ yl: 很好。回到你的岗位上吧。 #line:071456c
 你没再说什么，头也不回地进入了诊室。 #line:05a6408 
 
 //感觉应该在这里给玩家控制和英理对话的走向，是争吵还是妥协，影响她对你的判断
->>>>>>> Stashed changes
 <<NextYarn>>
 
 ===
diff --git a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn
index c889c4b98..c2af23e41 100644
--- a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn
+++ b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn
@@ -1,9 +1,18 @@
 title: Start
 tags: 
 colorID: 8
-<<<<<<< Updated upstream
-position: 205,-53
-=======
+position: 250,200
+---
+<<fade_out>>
+<<jump 佩佩>>
+===
+
+
+
+
+title: 火山
+tags: 
+colorID: 8
 position: 250,200
 ---
 <<hide_dialog>>
@@ -13,7 +22,7 @@ position: 250,200
 <<hide_dialog>>
 <<wait 1>>
 <<play_actor_animation ActorManager 医生 PlaySmoke>>
-me: 呼… #line:0f8a4c3 
+me: 呼… 
 <<hide_dialog>>
 <<wait 2>>
 
@@ -118,7 +127,6 @@ title: 佩佩
 tags: 
 colorID: 8
 position: 250,200
->>>>>>> Stashed changes
 ---
 <<hide_dialog>>
 <<set_time_of_day EnvironmentManager "day">>
@@ -225,7 +233,33 @@ peipei: 再见了，叶子。 #line:0694ade
 佩佩看了你一眼，微笑了一下，转头离开了。 #line:00d0440 
 <<fade_out_actor ActorManager "佩佩" 1>>
 <<wait 1>>
-吸完最后一口烟，你长舒一口气。 #line:0a732a9 
+<<play_sfx "event:/Scriptal/pager">>
+<<wait 1.5>>
+【我低头看BB机】
+
+me: “我：喂，在么”
+<<wait 1>>
+<<play_sfx "event:/Scriptal/pager_short">>
+me: “火山：-忙着呢”
+<<wait 1>>
+me: “我：你知道“待改进观察期”是什么吗”
+<<wait 1>>
+<<play_sfx "event:/Scriptal/pager_short">>
+me: “火山：-见鬼，你也被英理找了？”
+<<wait 0.5>>
+me: “我：“也”？”
+<<wait 1>>
+<<play_sfx "event:/Scriptal/pager_short">>
+me: “火山：-说来话长…晚上聊吧”
+<<wait 1>>
+me: “我：老地方？”
+<<wait 1>>
+<<play_sfx "event:/Scriptal/pager_short">>
+me: “火山：-老地方。”
+<<wait 1>>
+【我收起BB机】
+<<hide_dialog>>
+<<wait 1>>
 <<stop_music music>>
 ->CenterOption: 回到诊室 #line:05dd25e 
     <<hide_dialog>>
diff --git a/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn b/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn
index 7bfbdbb55..7deaf1590 100644
--- a/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn
+++ b/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn
@@ -31,9 +31,6 @@ position: 205,-53
     <<wait 1>>
     <<NextYarn>>
 
-<<<<<<< Updated upstream
-=======
-
 <<hide_dialog>>
 //火山正像他说的那样，坐在你们常去的那个卡座。卡座的调酒机体正微笑着听他说话。 #line:07db420 
 //hs: （拍打柜台）路斯！这边！ #line:0b48254 
@@ -149,5 +146,4 @@ me: 姐姐？
 
 <<hide_dialog>>
 <<NextYarn>>
->>>>>>> Stashed changes
 ===
\ No newline at end of file
diff --git a/Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn b/Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn
index aea9ce823..7d5cf94ca 100644
--- a/Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn
+++ b/Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn
@@ -129,7 +129,7 @@ position: 907,-2702
 <<switch_fix_system_to "BodyModule" "Head">>
 me:体征已经重新稳定。 #line:0b1dd52 
 ???: 我<waitfor=0.1>这是<waitfor=0.1>什么？<waitfor=0.1>我<waitfor=0.1>不应该<waitfor=0.1>还<waitfor=0.1>活着。
-???: <shake>我<waitfor=0.1>必须<waitfor=0.2>{size\}死{#size\}，回收<waitfor=0.1>必须<waitfor=0.1>被<waitfor=0.1>完成…</shake> #line:0ab8d02 
+???: <shake>我<waitfor=0.1>必须<waitfor=0.2>\{size\}死\{\#size\}，回收<waitfor=0.1>必须<waitfor=0.1>被<waitfor=0.1>完成…</shake> #line:0ab8d02 
 <<set_light_state warning>>
 ???: <shake>必须<waitfor=0.1>完成……<waitfor=0.3><rainb>excλute_core₭₭</rainb><waitfor=0.1>呃…<waitfor=0.1>啊……</shake> #line:083eaa8 
 me:幻象转移了，<waitfor=0.2>现在<waitfor=0.1>重新定位目标。 #line:015afd3