diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index bd7abb63..d4202564 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -81,7 +81,6 @@
                 <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
@@ -89,9 +88,7 @@
                                         <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