diff --git a/resources/views/account/listbayaranonline.blade.php b/resources/views/account/listbayaranonline.blade.php
index f868397c..6d2351db 100644
--- a/resources/views/account/listbayaranonline.blade.php
+++ b/resources/views/account/listbayaranonline.blade.php
@@ -24,12 +24,8 @@
                         <th>No Telefon</th>
                         <th>Bilangan Surat</th>
                         <th>Jumlah Pembayaran(RM)</th>
-<<<<<<< Updated upstream
                         <th>Jumlah Bidaan(RM)</th>
                         <th class="text-center">Action</th>
-=======
-                        <th class="text-center">Tindakan</th>
->>>>>>> Stashed changes
                     </tr>
             </thead>
             <tbody>
@@ -43,7 +39,7 @@
                             <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
                             <td>{{ number_format($winner['totalPay'], 2, '.', ',')}}</td>
                             <td>
-                                <a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$caw_code]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                <a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                 @endforeach
diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php
index ae227450..b02b724b 100644
--- a/resources/views/account/sahsagonline.blade.php
+++ b/resources/views/account/sahsagonline.blade.php
@@ -47,20 +47,10 @@
                                 <td>@php
                                     $myDateTime = DateTime::createFromFormat('Y-m-d', $sag['t_lelong'] );
                                     $t_lelong =  $myDateTime->format('d-m-Y');
-<<<<<<< Updated upstream
                                 echo($t_lelong);
                                 @endphp</td>
                                 <td>{{ number_format($sag['hargaasas'], 2, '.', ',') }}</td>
                                 <td>{{ number_format($sag['hargabida'], 2, '.', ',') }}</td>
-=======
-                                    echo($t_lelong);
-                                @endphp</td>
-                                <td>{{ number_format($sag['hargaasas'], 2, '.', ',')}}</td>
-                                <td>{{ number_format($sag['hargabida'], 2, '.', ',')}}</td>
-                                {{-- <td>{{ $sag['t_lelong'] }}</td> --}}
-                                {{-- <td>{{ $sag['hargaasas'] }}</td>
-                                <td>{{ $sag['hargabida'] }}</td> --}}
->>>>>>> Stashed changes
                                 <td>{{ $sag['masa_bidaan'] }}</td>
                                 <td>
                                     <button class="btn btn-outline-success btn-sm" disabled><b>{{ $sag['remark'] }}</b></button>