diff --git a/assets/jj15_zww/scene/jj15_zww.fire b/assets/jj15_zww/scene/jj15_zww.fire
index f8f4f09ee80d62c5ed28128aecb9e7596135436c..f6409ca8626ff873d13f039dc19820c141805844 100644
--- a/assets/jj15_zww/scene/jj15_zww.fire
+++ b/assets/jj15_zww/scene/jj15_zww.fire
@@ -1571,13 +1571,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-<<<<<<< HEAD
       "width": 1250,
       "height": 120
-=======
-      "width": 1135,
-      "height": 60
->>>>>>> f4a57bb1edc0e71981d1120bedee80497f755da2
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1642,13 +1637,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-<<<<<<< HEAD
       "width": 1150,
       "height": 126
-=======
-      "width": 1035,
-      "height": 75.6
->>>>>>> f4a57bb1edc0e71981d1120bedee80497f755da2
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1828,13 +1818,8 @@
     "_dstBlendFactor": 771,
     "_string": "题目:请参照图片移动下方按钮,组成完整的一句话",
     "_N$string": "题目:请参照图片移动下方按钮,组成完整的一句话",
-<<<<<<< HEAD
     "_fontSize": 50,
     "_lineHeight": 100,
-=======
-    "_fontSize": 45,
-    "_lineHeight": 60,
->>>>>>> f4a57bb1edc0e71981d1120bedee80497f755da2
     "_enableWrapText": true,
     "_N$file": {
       "__uuid__": "da919d2c-e1fd-4dfa-889b-82c53f3adb51"
@@ -1861,13 +1846,8 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-<<<<<<< HEAD
       "width": 1250,
       "height": 120
-=======
-      "width": 1135,
-      "height": 60
->>>>>>> f4a57bb1edc0e71981d1120bedee80497f755da2
     },
     "_resize": 1,
     "_N$layoutType": 1,
diff --git a/assets/jj15_zww/scene/jj15_zww.ts b/assets/jj15_zww/scene/jj15_zww.ts
index b6c1e7732bd77d670f54dc684ea60e5632995d51..cdfc0157446244bf59384d08497fc235ecd7b61d 100644
--- a/assets/jj15_zww/scene/jj15_zww.ts
+++ b/assets/jj15_zww/scene/jj15_zww.ts
@@ -707,8 +707,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
                     let score = recordData.result.overall
                     this.updatePopAni(null, score);
                     this.checkCardsTime = 3;
-                    this.resumeBgm();
-                    this.playBgmP100();
+                    this.scheduleOnce(() => {
+                        this.resumeBgm();
+                        this.playBgmP100();
+                    }, 0.1)
                 })
             } else {
                 this.recording = true;