diff --git a/pkg_join/views/index.vue b/pkg_join/views/index.vue
index 05b9264..87a998b 100644
--- a/pkg_join/views/index.vue
+++ b/pkg_join/views/index.vue
@@ -39,7 +39,10 @@
       @click="toTravelResidence"
     />
     <image
+<<<<<<< HEAD
+=======
       v-show="partnerType === 'province_partner' || partnerType === ''"
+>>>>>>> 320bda6ed8582fd2c81f73c272076e2b218418ab
       :src="images.experienceStoreImage"
       class="img-item"
       mode="widthFix"