diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue
index ca01ce454..74a90045a 100644
--- a/src/modules/07_insignia/views/ResultPage.vue
+++ b/src/modules/07_insignia/views/ResultPage.vue
@@ -545,7 +545,6 @@ const filterSelector = (val: any, update: Function, filtername: string) => {
 
       <div v-else-if="tab=='doc'">
         <Transition>
-<<<<<<< HEAD
         <div class="bg-base rounded-borders q-pa-md q-mb-md">
           <div class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md">
            
@@ -676,187 +675,10 @@ const filterSelector = (val: any, update: Function, filtername: string) => {
             </div>
 
             <div class="col-xs-12 col-md-3 flexsave">
-=======
-          <div>
-            <div class="q-pa-md">
-              <div class="row col-12 q-col-gutter-sm">
-                <!-- <div class="col-xs-6 col-md-2">
-                  <q-input
-                    class="bg-white"
-                    outlined
-                    dense
-                    lazy-rules
-                    v-model="issue"
-                    :label="`${'ฉบับ'}`"
-                    hide-bottom-space
-                  />
-                </div>
-                <div class="col-xs-6 col-md-2">
-                  <q-input
-                    class="bg-white"
-                    outlined
-                    dense
-                    lazy-rules
-                    v-model="book"
-                    :label="`${'เล่มที่'}`"
-                    hide-bottom-space
-                  />
-                </div>
-                <div class="col-xs-6 col-md-2">
-                  <q-input
-                    class="bg-white"
-                    outlined
-                    dense
-                    lazy-rules
-                    v-model="volume"
-                    :label="`${'เล่ม'}`"
-                    hide-bottom-space
-                  />
-                </div>
-                <div class="col-xs-6 col-md-2">
-                  <q-input
-                    class="bg-white"
-                    outlined
-                    dense
-                    lazy-rules
-                    v-model="section"
-                    :label="`${'ตอนที่'}`"
-                    hide-bottom-space
-                  />
-                </div> -->
-                <div class="col-xs-6 col-md-4">
-                  <q-file
-                    class="bg-white"
-                    outlined
-                    dense
-                    v-model="fileUpload"
-                    label="ไฟล์เอกสาร"
-                    hide-bottom-space
-                    lazy-rules
-                  >
-                    <template v-slot:prepend>
-                      <q-icon name="attach_file" color="primary" />
-                    </template>
-                  </q-file>
-                </div>
-                <div class="col-xs-6 col-md-3">
-                  <q-input
-                    class="bg-white"
-                    outlined
-                    dense
-                    lazy-rules
-                    v-model="documentTitle"
-                    :label="`${'ชื่อเอกสาร'}`"
-                    hide-bottom-space
-                  />
-                </div>
-                <div class="col-xs-12 col-md-5">
-                  <q-input
-                    class="bg-white"
-                    outlined
-                    dense
-                    lazy-rules
-                    v-model="reason"
-                    :label="`${'หมายเหตุ'}`"
-                    hide-bottom-space
-                  />
-                </div>
-                <!-- <div class="col-xs-6 col-md-2">
-                  <datepicker
-                    menu-class-name="modalfix"
-                    v-model="dateGoverment"
-                    :locale="'th'"
-                    autoApply
-                    borderless
-                    :enableTimePicker="false"
-                    week-start="0"
-                  >
-                    <template #year="{ year }">
-                      {{ year + 543 }}
-                    </template>
-                    <template #year-overlay-value="{ value }">
-                      {{ parseInt(value + 543) }}
-                    </template>
-                    <template #trigger>
-                      <q-input
-                        outlined
-                        dense
-                        class="full-width datepicker bg-white"
-                        :model-value="
-                          dateGoverment != null ? date2Thai(dateGoverment) : null
-                        "
-                        :label="`${'วันที่ประกาศราชกิจจานุเบกษา'}`"
-                      >
-                        <template v-slot:prepend>
-                          <q-icon
-                            name="event"
-                            class="cursor-pointer"
-                            style="color: var(--q-primary)"
-                          >
-                          </q-icon>
-                        </template>
-                      </q-input>
-                    </template>
-                  </datepicker>
-                </div>
-                <div class="col-xs-6 col-md-2">
-                  <datepicker
-                    menu-class-name="modalfix"
-                    v-model="dateReceiver"
-                    :locale="'th'"
-                    autoApply
-                    borderless
-                    :enableTimePicker="false"
-                    week-start="0"
-                  >
-                    <template #year="{ year }">
-                      {{ year + 543 }}
-                    </template>
-                    <template #year-overlay-value="{ value }">
-                      {{ parseInt(value + 543) }}
-                    </template>
-                    <template #trigger>
-                      <q-input
-                        outlined
-                        dense
-                        class="full-width datepicker bg-white"
-                        :model-value="
-                          dateReceiver != null ? date2Thai(dateReceiver) : null
-                        "
-                        :label="`${'วันที่ได้รับ'}`"
-                      >
-                        <template v-slot:prepend>
-                          <q-icon
-                            name="event"
-                            class="cursor-pointer"
-                            style="color: var(--q-primary)"
-                          >
-                          </q-icon>
-                        </template>
-                      </q-input>
-                    </template>
-                  </datepicker>
-                </div> -->
-                <!--<div class="col-xs-12 col-md-9">
-                  <p>
-                    วันที่ประกาศราชกิจจานุเบกษา <b>{{ date2Thai(new Date()) }}</b>
-                  </p>
-                </div> -->
-                <!-- <div class="col-xs-6 col-md-3">
-                  <p>
-                    วันที่ได้รับ <b>{{ date2Thai(new Date()) }}</b>
-                  </p>
-                </div> -->
-              </div>
-            </div>
-            <div class="col-12"><q-separator /></div>
-            <div class="col-12 flexsave q-pa-sm">
-              <q-space/>
->>>>>>> develop
               <q-btn label="บันทึก" @click="save" color="public" />
             </div>
           </div>
-            
+        </div>   
           
         </Transition>
       </div>