@@ -2,16 +2,12 @@
 <nav class="navbar navbar-default">
     <div class="container-fluid">
         <div class="navbar-header">
-<<<<<<< HEAD
             <a class="navbar-brand" href="#/clouds">Network Traffic Testing Tool</a>
-=======
-            <a class="navbar-brand" href="#/">NTT Tool</a>
->>>>>>> 91ddeb832660c4a8a58104429283692e31a8cd84
         </div>
         <ul class="nav navbar-nav navbar-right" ng-show="$root.isLoggedin">
             <li><a href="#/clouds">Clouds</a></li>
             <li><a href ng-click="logout()">Logout</a> </li>
         </ul>
     </div>
 </nav>
-<!-- ./navbar -->
+<!-- ./navbar -->