diff --git a/src/components/Pages/Gangguan/Daftar/DGangguan_BM.vue b/src/components/Pages/Gangguan/Daftar/DGangguan_BM.vue
index 7169c4a..90407ad 100755
--- a/src/components/Pages/Gangguan/Daftar/DGangguan_BM.vue
+++ b/src/components/Pages/Gangguan/Daftar/DGangguan_BM.vue
@@ -14,11 +14,7 @@
       :hover-state-enabled="true"
       @selection-changed=""
       :column-width="100"
-<<<<<<< HEAD
-      @exporting=""
-=======
       @exporting="onExporting"
->>>>>>> e9b05e7 (feat: create pdf export pdf in daftar gangguan berdasar media dan diselesaikan mobile apkt)
       :allow-column-resizing="true"
       column-resizing-mode="widget"
     >
@@ -70,11 +66,7 @@
         alignment="center"
         data-field="nama_pelapor"
         caption="Nama Pelapor"
-<<<<<<< HEAD
         cell-template="formatText"
-=======
-        cell-template="cellLeft"
->>>>>>> e9b05e7 (feat: create pdf export pdf in daftar gangguan berdasar media dan diselesaikan mobile apkt)
       />
       <DxColumn
         css-class="custom-table-column"
@@ -82,11 +74,7 @@
         alignment="center"
         data-field="alamat_pelapor"
         caption="Alamat Pelapor"
-<<<<<<< HEAD
         cell-template="formatText"
-=======
-        cell-template="cellLeft"
->>>>>>> e9b05e7 (feat: create pdf export pdf in daftar gangguan berdasar media dan diselesaikan mobile apkt)
       />
       <DxColumn
         css-class="custom-table-column"
@@ -102,11 +90,7 @@
         alignment="center"
         data-field="keterangan_pelapor"
         caption="Keterangan Pelapor"
-<<<<<<< HEAD
         cell-template="formatText"
-=======
-        cell-template="cellLeft"
->>>>>>> e9b05e7 (feat: create pdf export pdf in daftar gangguan berdasar media dan diselesaikan mobile apkt)
       />
       <DxColumn
         css-class="custom-table-column"
@@ -146,11 +130,7 @@
         alignment="center"
         data-field="durasi_response_time"
         caption="Durasi Response Time"
-<<<<<<< HEAD
         cell-template="formatTime"
-=======
-        cell-template="data-waktu"
->>>>>>> e9b05e7 (feat: create pdf export pdf in daftar gangguan berdasar media dan diselesaikan mobile apkt)
       />
       <DxColumn
         css-class="custom-table-column"
@@ -158,11 +138,7 @@
         alignment="center"
         data-field="durasi_recovery_time"
         caption="Durasi Recovery Time"
-<<<<<<< HEAD
         cell-template="formatTime"
-=======
-        cell-template="data-waktu"
->>>>>>> e9b05e7 (feat: create pdf export pdf in daftar gangguan berdasar media dan diselesaikan mobile apkt)
       />
       <DxColumn
         css-class="custom-table-column"
@@ -186,11 +162,7 @@
         alignment="center"
         data-field="keterangan_media"
         caption="Keterangan Media"
-<<<<<<< HEAD
         cell-template="formatText"
-=======
-        cell-template="cellLeft"
->>>>>>> e9b05e7 (feat: create pdf export pdf in daftar gangguan berdasar media dan diselesaikan mobile apkt)
       />
 
       <template #cellCenter="{ data }">