diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
index d0d42098..eaf3c793 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -69,18 +69,18 @@
                       >
                         <div class="frame_list">
                           <div
-                          v-for="(instance, idx) in series.instanceInfoList"
-                          :key="instance.Id"
-                          class="frame_content"
-                          :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
-                          @click.stop="showMultiFrames(index,series, i, instance)"
-                        >
-                          <div>
-                            <div>{{ instance.InstanceNumber }}</div>
-                            <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                          </div>
+                            v-for="(instance, idx) in series.instanceInfoList"
+                            :key="instance.Id"
+                            class="frame_content"
+                            :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
+                            @click.stop="showMultiFrames(index,series, i, instance)"
+                          >
+                            <div>
+                              <div>{{ instance.InstanceNumber }}</div>
+                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
+                            </div>
 
-                        </div>
+                          </div>
                         </div>
                         <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;color: #ffeb3b;" />
                       </el-popover>
@@ -621,12 +621,9 @@ export default {
           this.studyIndex = studyIndex
           this.seriesIndex = seriesIndex
           this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
-<<<<<<< HEAD
-          var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
-=======
           // var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
-          var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
->>>>>>> uat
+          var dicomStatck = Object.assign({}, this.studyList[studyIndex].SeriesList[seriesIndex])
+
           dicomStatck.imageIdIndex = 0
           this.$emit('loadImageStack', dicomStatck)
           if (!series.loadStatus && series.modality !== 'SR') {
@@ -677,16 +674,12 @@ export default {
         }
       } else {
         imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
-<<<<<<< HEAD
       }
-=======
-      } 
->>>>>>> uat
       this.studyIndex = studyIndex
       this.seriesIndex = seriesIndex
       this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
       // var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
-      var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
+      var dicomStatck = Object.assign({}, this.studyList[studyIndex].SeriesList[seriesIndex])
       dicomStatck.imageIds = imageIds
       dicomStatck.imageIdIndex = 0
       this.$emit('loadImageStack', dicomStatck)