diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php
index c75827b9..efa0381e 100644
--- a/app/Http/Controllers/Frontend/DashboardController.php
+++ b/app/Http/Controllers/Frontend/DashboardController.php
@@ -13,4 +13,8 @@ class DashboardController extends BaseController
     {
         return view('frontend.dashboard');
     }
+	public function test()
+    {
+        return view('frontend.dashboard');
+    }
 }
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 6737b17d..bd7abb63 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -81,6 +81,7 @@
                 <a href="{{ url('/admin') }}">Admin</a>
             @endif
             <a href="{{ url('/user/dashboard') }}">Dashboard</a>
+<<<<<<< HEAD
             <a href="{!! url('/logout') !!}" class="btn btn-default btn-flat"
                                             onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
                                             Sign out
@@ -88,6 +89,9 @@
                                         <form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
                                             {{ csrf_field() }}
                                         </form>
+=======
+            <a href="{{ url('/logout') }}">Logout</a>
+>>>>>>> #26.1 test
         @endif
     </div>
     @endif