diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml
index 6ad9a562..714e1202 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -400,7 +400,6 @@
     <image id="iaes7dhg" name="renwu-AE_00092.png" path="/images/clip_renwu/" exported="true" qualityOption="source" atlas="10"/>
     <image id="iaes7dhh" name="renwu-AE_00096.png" path="/images/clip_renwu/" exported="true" qualityOption="source" atlas="10"/>
     <image id="iaes7dhi" name="renwu-AE_00142.png" path="/images/clip_renwu/" exported="true" qualityOption="source" atlas="10"/>
-<<<<<<< HEAD
     <image id="iaes7dhk" name="hecheng 1_00054.png" path="/images/clip_joinRoom/" exported="true" atlas="9"/>
     <image id="iaes7dhl" name="hecheng 1_00056.png" path="/images/clip_joinRoom/" exported="true" atlas="9"/>
     <image id="iaes7dhm" name="hecheng 1_00058.png" path="/images/clip_joinRoom/" exported="true" atlas="9"/>
@@ -658,11 +657,6 @@
     <image id="thxk7dqg" name="taohua_00052.png" path="/images/clip_bg/" exported="true" atlas="6"/>
     <image id="thxk7dqh" name="taohua_00028.png" path="/images/clip_bg/" exported="true" atlas="6"/>
     <image id="thxk7dqi" name="taohua_00114.png" path="/images/clip_bg/" exported="true" atlas="6"/>
-=======
-    <misc id="nzuk7dhj" name="1030107.atlas" path="/images/movieClip/"/>
-    <image id="nzuk7dhk" name="1030107.png" path="/images/movieClip/"/>
-    <spine id="nzuk7dhl" name="1030107.json" path="/images/movieClip/" width="1053" height="1042" require="nzuk7dhj,nzuk7dhk" atlasNames="1030107" anchor="289,996"/>
->>>>>>> abfaee1b282a05078baf5eb31aea53471d1e3a26
   </resources>
   <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
     <atlas name="默认" index="0"/>