diff --git a/css/card.css b/css/card.css
index 2701e69..524aaa1 100644
--- a/css/card.css
+++ b/css/card.css
@@ -176,8 +176,12 @@
 
 .card-text-2 {
     position: absolute;
+<<<<<<< HEAD
     left:280px;
     top: 20px;
+=======
+    right:80px;
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
     bottom: 50px;
     opacity: 0;
 }
diff --git a/css/style.css b/css/style.css
index 2919848..f2369f5 100644
--- a/css/style.css
+++ b/css/style.css
@@ -5,9 +5,14 @@ body{
     position: fixed;
     font-family: 'Times New Roman', Times, serif;
     top: 14%;
+<<<<<<< HEAD
     left: 10%;
     width: 80%;
     font-size: 80px;
+=======
+    left: 2%;
+    font-size: 120px;
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
     z-index: 9;
     color: #ffffff;
     transition: all  0.6s ease-in-out;
diff --git a/index.html b/index.html
index 97804f8..f178b6f 100644
--- a/index.html
+++ b/index.html
@@ -167,7 +167,11 @@
     </div>
 
     <div class="titlebox">
+<<<<<<< HEAD
         <h1 class="title" id="title">Complete bio-degradation of PBAT <br> via evolved hydrolases and construction of an engineered Pseudomonas putida KT2440 strain</h1>
+=======
+        <h1 class="title" id="title">Lorem ipsum dolor elit. Officia, voluptatibus!</h1>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
     </div>
     <script>
         const title = document.getElementById('title');
@@ -196,8 +200,15 @@ <h1 class="title" id="title">Complete bio-degradation of PBAT <br> via evolved h
             <!-- 夹在头和尾之间 -->
             <section class="second_part" style="position: relative;top: 1000px;">
                 <div class="WhatisPBAT" id="pbContainer">
+<<<<<<< HEAD
                     <h1>What is PBAT?</h1>
                     Poly (butylene adipate-co-terephthalate) (PBAT), a polymer synthesized from the monomers terephthalic acid (TPA), adipic acid (AA), and 1,4-butanediol (BDO), has garnered significant attention as a biocompatible and degradable polymeric material, exhibiting considerable potential for widespread application in the realm of agricultural film technology.
+=======
+                    <h1>PBAT introduction</h1>
+                    Poly (butylene adipate-co-terephthalate) (PBAT), a polymer synthesized from the monomers terephthalic acid (TPA), adipic
+                    acid (AA), and 1,4-butanediol (BDO), has garnered significant attention as a biocompatible and degradable polymeric
+                    material, exhibiting considerable potential for widespread application in the realm of agricultural film technology.
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                 </div>
                 <script>
                     const pbContainer = document.getElementById('pbContainer');
@@ -300,6 +311,7 @@ <h1>What is PBAT?</h1>
                 <!-- 易错DNA部分 -->
                 <div class="DNA_line_container" id="box">
                     <div class="DNA_box1" id="DNABox1">
+<<<<<<< HEAD
                         <div><h1>Challenges</h1>
                             Firstly, the natural degradation rate of PBAT is extremely slow. After three months of natural degradation, it can only be degraded by about 2.3%. Secondly, the PBAT decomposition rates of existing PBAT-degrading enzymes in room temperature are generally low, restricting its utilization in the context of agricultural practices. Additionally, PBAT hydrolysis products can be toxic, adversely affecting microbial metabolism and efficient substrate assimilation.</div>
                     </div>
@@ -309,6 +321,21 @@ <h1>Solution</h1>
                             
                             We identified three distinct enzyme candidates for targeted evolutionary engineering, with the objective of developing highly efficient PBAT hydrolases that exhibit optimal catalytic activity under room temperature conditions. Furthermore, we also aim to obtain an engineering <em>Pseudomonas putida
                             </em> KT2440 strain capable of catabolizing of PBAT-derived degradation products.
+=======
+                        <div><h1>Development of PBAT hydrolases</h1>
+                        We selected IsPETase, BsLipA, and Lipase1028 as the starting points for directed evolution and established three
+                        mutation libraries using error-prone PCR and site-directed mutagenesis. Hydrolysis zone screening method was employed to
+                        endow them with the ability to degrade PBAT.</div>
+                    </div>
+                    <div class="DNA_box2" id="DNABox2">
+                        <div>
+                            <h1>Development of engineered Pseudomonas putida KT2440 strain</h1>
+                            
+                            The evolved PBAT hydrolases were transformed into Pseudomonas putida KT2440-tph, which had undergone adaptive laboratory
+                            evolution to acquire the ability to utilize terephthalic acid (TPA) and 1,4-butanediol (BDO) as carbon sources. This
+                            allowed the construction of a KT2440 strain with high PBAT degradation capacity and the ability to grow using its
+                            degradation products.
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                     </div>
 
@@ -363,6 +390,7 @@ <h1>Solution</h1>
                 </script>
             </section>
 
+<<<<<<< HEAD
             <h1 class="t1 aos-hover-zoom" data-aos="fade-up-left" data-aos-duration="1500ms"><strong>Development of a secretion pathway in <em> Bacillus subtilis</em></strong><br><br>
                 We first established an efficient secretion system within Bacillus subtilis. The signal peptide AprE was fused to the N-terminus of the enzymes to enable them to be effectively secreted out of the cells via the Sec pathway. The successfully constructed protein exocytosis pathway allows for intuitive hydrolysis zones screening of the mutation libraries.
                 </h1>
@@ -373,6 +401,22 @@ <h1 class="t2 aos-hover-zoom" data-aos="fade-up-right" data-aos-duration="1500ms
                 endow them with the ability to degrade PBAT.</h1>
             <h1 class="t3 aos-hover-zoom" data-aos="fade-up-left" data-aos-duration="1500ms"><strong>Development of an engineered <em>Pseudomonas putida</em> KT2440 strain</strong><br><br>The evolved PBAT hydrolases
                 were transformed into <em>Pseudomonas putida</em> KT2440-tph, which had undergone adaptive laboratory
+=======
+            <h1 class="t1 aos-hover-zoom" data-aos="fade-up-left" data-aos-duration="1500ms">Poly (butylene
+                adipate-co-terephthalate) (PBAT), a polymer synthesized from the monomers terephthalic acid (TPA),
+                adipic
+                acid (AA), and 1,4-butanediol (BDO), has garnered significant attention as a biocompatible and
+                degradable polymeric
+                material, exhibiting considerable potential for widespread application in the realm of agricultural film
+                technology.</h1>
+            <h1 class="t2 aos-hover-zoom" data-aos="fade-up-right" data-aos-duration="1500ms">We selected IsPETase,
+                BsLipA, and Lipase1028 as the starting points for directed evolution and established three
+                mutation libraries using error-prone PCR and site-directed mutagenesis. Hydrolysis zone screening method
+                was employed to
+                endow them with the ability to degrade PBAT.</h1>
+            <h1 class="t3 aos-hover-zoom" data-aos="fade-up-left" data-aos-duration="1500ms">The evolved PBAT hydrolases
+                were transformed into Pseudomonas putida KT2440-tph, which had undergone adaptive laboratory
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                 evolution to acquire the ability to utilize terephthalic acid (TPA) and 1,4-butanediol (BDO) as carbon
                 sources. This
                 allowed the construction of a KT2440 strain with high PBAT degradation capacity and the ability to grow
diff --git a/pages/member.html b/pages/member.html
index 53bfba0..74641f2 100644
--- a/pages/member.html
+++ b/pages/member.html
@@ -151,6 +151,7 @@
         <div class="out">
             <div class="inner">
                 <div class="img">
+<<<<<<< HEAD
                     <img src="./team原图/team头图1.JPG" alt="" />
                 </div>
                 <div class="img">
@@ -170,6 +171,27 @@
                 </div>
                 <div class="img">
                     <img src="./team原图/team头图7.JPG" alt="" />
+=======
+                    <img src="../images/1.png" alt="" />
+                </div>
+                <div class="img">
+                    <img src="../images/2.png" alt="" />
+                </div>
+                <div class="img">
+                    <img src="../images/3.png" alt="" />
+                </div>
+                <div class="img">
+                    <img src="../images/4.png" alt="" />
+                </div>
+                <div class="img">
+                    <img src="../images/5.png" alt="" />
+                </div>
+                <div class="img">
+                    <img src="../images/6.png" alt="" />
+                </div>
+                <div class="img">
+                    <img src="../images/7.png" alt="" />
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                 </div>
             </div>
             <div class="arrow">
@@ -227,13 +249,26 @@ <h2>Xi Chen</h2>
                             <p>LAB</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Performed the experiments, accounted for epPCR and screening.
                             </p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo HWY">
                             <img src="../images/cartoon_characters/胡皖豫.PNG" alt="" class="photo-1 ">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/hwy.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png " alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                     <div class="card">
@@ -242,13 +277,26 @@ <h2>Xi Chen</h2>
                             <p style="position: relative; top: -24px;">LAB</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Performed the whole experiments, analyzed the whole experimental data and made the key conclusion. 
                             </p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo HCY">
                             <img src="../images/cartoon_characters/黄橙玥.PNG" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/hcy.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                     <div class="card">
@@ -257,12 +305,25 @@ <h2>Xi Chen</h2>
                             <p>LAB</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Guided the team, supported the experiment and wiki with rich experience with contributions from other authors.</p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo LJ">
                             <img src="../images/cartoon_characters/刘峻.PNG" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/lj.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                 </section>
@@ -273,14 +334,27 @@ <h2>Xi Chen</h2>
                             <p>LAB</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Supported the experiment with rich experience and wrote the article with contributions from other authors.
                             </p>
 
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo LY">
                             <img src="../images/cartoon_characters/刘宜.PNG" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/ly.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                     <div class="card">
@@ -289,12 +363,25 @@ <h2>Xi Chen</h2>
                             <p>LAB</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Performed the experiments, accounted for epPCR, site-mutagenesis and screening.	</p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo LKX">
                             <img src="../images/cartoon_characters/路可欣.PNG" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/lkx.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                     <div class="card">
@@ -303,12 +390,25 @@ <h2>Xi Chen</h2>
                             <p>LAB</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Designed the high-throughput screening method, performed the ALE of KT2440 strain experiments, and collected the background knowledge.</p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo LRJ">
                             <img src="../images/cartoon_characters/罗仁杰.PNG" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/lrj.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                 </section>
@@ -320,12 +420,25 @@ <h2>Xi Chen</h2>
                             -24px;">LAB</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Supported the computational experiments with rich experience.</p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo SHZ">
                             <img src="../images/cartoon_characters/宋含章.PNG" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/shz.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                     <div class="card">
@@ -334,12 +447,25 @@ <h2>Xi Chen</h2>
                             <p>LAB</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Supported the experiment with rich experience and wrote the article with contributions from other authors. </p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo YYX">
                             <img src="../images/cartoon_characters/杨雨欣.PNG" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/yyx.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                     <div class="card">
@@ -348,12 +474,25 @@ <h2>Xi Chen</h2>
                             <p style="position: relative; top: -24px;">LAB</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Performed the experiments, accounted for epPCR, site-mutagenesis and screening.</p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+                    
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo">
                             <img src="../images/cartoon_characters/叶陈航.png" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/ych.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                     
                     </div>
                 </section>
@@ -364,12 +503,25 @@ <h2>Xi Chen</h2>
                             <p>LAB</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Guided the team, support the experiment with rich experience and wrote the article with contributions from other authors.</p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+                    
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo ZML">
                             <img src="../images/cartoon_characters/朱茂隆.PNG" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/zml.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                     
                     </div>
                     
@@ -379,12 +531,25 @@ <h2>Xi Chen</h2>
                             <p>MODEL</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Accounted for the computational experiments, including molecular dynamic simulations, modelling the structures of proteins and so on.</p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo">
                             <img src="../images/cartoon_characters/左旭辉.png" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/zjh.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                     <div class="card" style="visibility: hidden;">
@@ -420,12 +585,25 @@ <h2>Xi Chen</h2>
                             <p>DESIGN</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Designed the logo and poster for the team, made and beautified the wiki and slides.</p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo BJX">
                             <img src="../images/cartoon_characters/白佳雪.PNG" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/bjx.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                     <div class="card">
@@ -434,12 +612,25 @@ <h2>Xi Chen</h2>
                             <p>DESIGN</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Designed the logo and poster for the team, made and beautified the wiki and slides, helped with the wiki and finished with the photo retouching work.</p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo CKX">
                             <img src="../images/cartoon_characters/陈可馨.PNG" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/ckx.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                     <div class="card">
@@ -448,13 +639,26 @@ <h2>Xi Chen</h2>
                             <p>DESIGN</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             
                             <p>Designed the logo and poster for the team, made and beautified the wiki and slides.</p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo MRY">
                             <img src="../images/cartoon_characters/米芮瑶.PNG" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/mry.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                 </section>
@@ -465,12 +669,25 @@ <h2>Xi Chen</h2>
                             <p style="position: relative;top: -24px;">WIKI</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Finished the wiki and provided useful wiki tools and suggestions.</p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo CWB">
                             <img src="../images/cartoon_characters/程文博.png" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/cwb.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
                     <div class="card">
@@ -479,12 +696,25 @@ <h2>Xi Chen</h2>
                             <p>WIKI</p>
                         </div>
                         <div class="card-text-2">
+<<<<<<< HEAD
                             <p>Finished the wiki and provided useful wiki tools and suggestions.</p>
+=======
+                            <p>XXXXXXXXX
+                            </p>
+                            <p>XXXXXXXXX
+
+                            </p>
+                            <p>XXXXXXXXXXX</p>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
                         </div>
                         <div class="photo WYM">
                             <img src="../images/cartoon_characters/王亦马.PNG" alt="" class="photo-1">
                         </div>
+<<<<<<< HEAD
                         <img src="./single_person/wym.JPG" alt="" class="photo-2">
+=======
+                        <img src="../images/people2.png" alt="" class="photo-2">
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
                     </div>
 
@@ -519,12 +749,21 @@ <h2>Xi Chen</h2>
 
     <!-- 拼图 -->
     <section class="piece-container">
+<<<<<<< HEAD
         <div class="piece piece1"><img src="./team原图/拼图1.JPG" alt="Image 1" class="piece_image1"></div>
         <div class="piece piece2"><img src="./team原图/拼图2.JPG" alt="Image 2" class="piece_image2"></div>
         <div class="piece piece3"><img src="./team原图/拼图3.JPG" alt="Image 3" class="piece_image3"></div>
         <div class="piece piece4"><img src="./team原图/拼图4.JPG" alt="Image 4" class="piece_image4"></div>
         <div class="piece piece5"><img src="./team原图/拼图5.JPG" alt="Image 5" class="piece_image5"></div>
         <div class="piece piece6"><img src="./team原图/拼图6.JPG" alt="Image 6" class="piece_image6"></div>
+=======
+        <div class="piece piece1"><img src="../images/cloud_music/1.jpg" alt="Image 1" class="piece_image1"></div>
+        <div class="piece piece2"><img src="../images/cloud_music/2.jpg" alt="Image 2" class="piece_image2"></div>
+        <div class="piece piece3"><img src="../images/cloud_music/3.jpg" alt="Image 3" class="piece_image3"></div>
+        <div class="piece piece4"><img src="../images/cloud_music/4.jpg" alt="Image 4" class="piece_image4"></div>
+        <div class="piece piece5"><img src="../images/cloud_music/5.jpg" alt="Image 5" class="piece_image5"></div>
+        <div class="piece piece6"><img src="../images/cloud_music/6.jpg" alt="Image 6" class="piece_image6"></div>
+>>>>>>> 914ed4aa4dc10d7c1a2a0c39d938781f31bfb64e
 
         <div class="full-image" id="fullImage">
             <img src="" alt="Full View" id="fullImageView">