diff --git a/src/components/GuideBar/index.tsx b/src/components/GuideBar/index.tsx
index d616759..e2084e7 100644
--- a/src/components/GuideBar/index.tsx
+++ b/src/components/GuideBar/index.tsx
@@ -3,7 +3,7 @@ import { View, Text, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import img from '@/config/images'
 import './index.scss'
-
+import PublishMenu from '../PublishMenu'
 export type currentPageType = 'games' | 'message' | 'personal'
 
 const GuideBar = (props) => {
@@ -59,9 +59,10 @@ const GuideBar = (props) => {
           ))}
         </View>
         {/* publish button on the right */}
-        <View className='guide-bar-publish' onClick={handlePublish}>
+        {/* <View className='guide-bar-publish' onClick={handlePublish}>
           <Image className='guide-bar-publish-icon' src={img.ICON_GUIDE_BAR_PUBLISH} />
-        </View>
+        </View> */}
+        <PublishMenu />
       </View>
     </View>
   )
diff --git a/src/components/PublishMenu/index.module.scss b/src/components/PublishMenu/index.module.scss
index 8e5f484..22992e1 100644
--- a/src/components/PublishMenu/index.module.scss
+++ b/src/components/PublishMenu/index.module.scss
@@ -1,19 +1,8 @@
 .publishMenu {
-  position: fixed;
-  bottom: 40px;
-  right: 40px;
+  position: relative;
   z-index: 1000;
 }
 
-.overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: transparent;
-  z-index: 999;
-}
 
 .menuCard {
   position: absolute;
diff --git a/src/components/index.ts b/src/components/index.ts
index 6e67045..665421f 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -9,12 +9,12 @@ import TimeSelector from './TimeSelector'
 import TitleTextarea from './TitleTextarea'
 import CommonPopup from './CommonPopup'
 import DateTimePicker from './DateTimePicker/DateTimePicker'
-<<<<<<< HEAD
 import TimePicker from './TimePicker/TimePicker'
 import CalendarCard, { DialogCalendarCard } from './CalendarCard'
 import CommonDialog from './CommonDialog'
 import PublishMenu from './PublishMenu/PublishMenu'
- 
+import UploadCover from './UploadCover'
+
  export { 
      ActivityTypeSwitch, 
      TextareaTag, 
@@ -30,23 +30,7 @@ import PublishMenu from './PublishMenu/PublishMenu'
     CalendarCard,
     DialogCalendarCard,
     CommonDialog,
-    PublishMenu
+    PublishMenu,
+    UploadCover
  }
-=======
-import UploadCover from './UploadCover'
-
-export {
-    ActivityTypeSwitch,
-    TextareaTag,
-    FormSwitch,
-    ImageUpload,
-    Range,
-    NumberInterval,
-    TimeSelector,
-    TitleTextarea,
-    CommonPopup,
-    DateTimePicker,
-    UploadCover,
-}
->>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034
 
diff --git a/src/config/images.js b/src/config/images.js
index 76a8f0a..ea42fd9 100644
--- a/src/config/images.js
+++ b/src/config/images.js
@@ -19,7 +19,6 @@ export default {
     ICON_LIST_RIGHT_ARROW: require('@/static/list/icon-list-right-arrow.svg'),
     ICON_ARROW_LEFT: require('@/static/detail/icon-arrow-left.svg'),
     ICON_LOGO_GO: require('@/static/detail/icon-logo-go.svg'),
-    ICON_SEARCH: require('@/static/publishBall/icon-search.svg'),
     ICON_MAP: require('@/static/publishBall/icon-map.svg'),
     ICON_STADIUM: require('@/static/publishBall/icon-stadium.svg'),
     ICON_ARRORW_SMALL: require('@/static/publishBall/icon-arrow-small.svg'),
@@ -28,13 +27,11 @@ export default {
     ICON_ADD: require('@/static/publishBall/icon-add.svg'),
     ICON_COPY: require('@/static/publishBall/icon-arrow-right.svg'),
     ICON_DELETE: require('@/static/publishBall/icon-delete.svg'),
-<<<<<<< HEAD
     ICON_RIGHT_MAX: require('@/static/publishBall/icon-right-max.svg'),
     ICON_PLUS: require('@/static/publishBall/icon-plus.svg'),
     ICON_GROUP: require('@/static/publishBall/icon-group.svg'),
     ICON_PERSON: require('@/static/publishBall/icon-person.svg'),
     ICON_PUBLISH: require('@/static/publishBall/icon-publish.png'),
-=======
     ICON_CIRCLE_UNSELECT: require('@/static/publishBall/icon-circle-unselect.svg'),
     ICON_CIRCLE_SELECT: require('@/static/publishBall/icon-circle-select-ring.svg'),
     ICON_CIRCLE_SELECT_ARROW: require('@/static/publishBall/icon-circle-select-arrow.svg'),
@@ -53,5 +50,4 @@ export default {
     ICON_LIST_PLAYING_GAME: require('@/static/list/icon-paying-game.svg'),
     ICON_LIST_LOAD_ERROR: require('@/static/list/icon-load-error.svg'),
     ICON_LIST_RELOAD: require('@/static/list/icon-reload.svg'),
->>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034
   }
\ No newline at end of file
diff --git a/src/pages/publishBall/index.tsx b/src/pages/publishBall/index.tsx
index 97f8f69..d13d9d2 100644
--- a/src/pages/publishBall/index.tsx
+++ b/src/pages/publishBall/index.tsx
@@ -275,11 +275,7 @@ const PublishBall: React.FC = () => {
     <View className={styles['publish-ball']}>
       {/* 活动类型切换 */}
       <View className={styles['activity-type-switch']}>
-<<<<<<< HEAD
         {/* <ActivityTypeSwitch 
-=======
-        <ActivityTypeSwitch
->>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034
           value={activityType}
           onChange={handleActivityTypeChange}
         /> */}
@@ -334,7 +330,6 @@ const PublishBall: React.FC = () => {
       </View>
 
       {/* 删除确认弹窗 */}
-<<<<<<< HEAD
       <CommonDialog
         visible={deleteConfirm.visible}
         cancelText="再想想"
@@ -344,30 +339,6 @@ const PublishBall: React.FC = () => {
         contentTitle="确认移除该场次？"
         contentDesc="该操作不可恢复"
       />
-=======
-      {deleteConfirm.visible && (
-        <View className={styles['delete-modal']}>
-          <View className={styles['delete-modal__content']}>
-            <Text className={styles['delete-modal__title']}>确认移除该场次？</Text>
-            <Text className={styles['delete-modal__desc']}>该操作不可恢复</Text>
-            <View className={styles['delete-modal__actions']}>
-              <Button
-                className={styles['delete-modal__btn']}
-                onClick={closeDeleteConfirm}
-              >
-                再想想
-              </Button>
-              <Button
-                className={styles['delete-modal__btn']}
-                onClick={confirmDelete}
-              >
-                确认移除
-              </Button>
-            </View>
-          </View>
-        </View>
-      )}
->>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034
 
       {/* 完成按钮 */}
       <View className={styles['submit-section']}>
diff --git a/src/services/publishService.ts b/src/services/publishService.ts
index c6466e7..5c135ad 100644
--- a/src/services/publishService.ts
+++ b/src/services/publishService.ts
@@ -122,18 +122,17 @@ class PublishService {
     return httpService.post('/venues/list', data, {
       showLoading: false })
   }
-<<<<<<< HEAD
   // 畅打发布
   async create_play_pmoothly(data: PublishBallData): Promise<ApiResponse<Response>> {
     return httpService.post('/games/create_play_pmoothly', data, {
       showLoading: true,
       loadingText: '发布中...'
-=======
+    })
+  }
   async getPictures(req: getPicturesReq): Promise<ApiResponse<getPicturesRes>> {
     return httpService.post('/gallery/sys_img_list', req, {
       showLoading: false,
       showToast: false,
->>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034
     })
   }
 }