diff --git a/resources/views/includes/header.blade.php b/resources/views/includes/header.blade.php
index 2a03185d..3a0fdd58 100644
--- a/resources/views/includes/header.blade.php
+++ b/resources/views/includes/header.blade.php
@@ -28,24 +28,6 @@
                 <a class="dropdown-item" href="{{ route('editprofile') }}">
                 <i class="far fa fa-user"></i>{{ __('Profile') }}
                 </a>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-=======
-=======
-              </div>
-              <div class="dropdown-item">
-                {{-- <a class="far fa fa-key" href="tukarkatalaluan">Tukar Katalaluan</a> --}}
-                <a class="dropdown-item" href="{{ route('changePasswordGet') }}">
-                  <i class="far fa fa-key"></i>{{ __('Tukar Katalaluan') }}
-                  </a>
->>>>>>> Stashed changes
-              </div>
-              <div class="dropdown-item">
-                {{-- <a class="far fa fa-key" href="tukarkatalaluan">Tukar Katalaluan</a> --}}
-                <a class="dropdown-item" href="{{ route('changePasswordGet') }}">
-                  <i class="far fa fa-key"></i>{{ __('Tukar Katalaluan') }}
-                  </a>
->>>>>>> Stashed changes
               </div>
               <div class="dropdown-item">
                 {{-- <a class="far fa fa-key" href="tukarkatalaluan">Tukar Katalaluan</a> --}}