resolve merge conflict in navbar

views/account/show.jade

@@ -41,7 +41,7 @@ block content
                         .col-xs-12.col-sm-12.col-md-3.text-center
                             .background-svg.img-center
                                 .points-on-top
-                                    = "[ " + points + " ]"
+                                    = "[ " + user.progressTimestamps.length + " ]"
 
 
                 .row

views/partials/navbar.jade

@@ -12,7 +12,7 @@
 .collapse.navbar-collapse
     ul.nav.navbar-nav.navbar-right.hamburger-dropdown
         li
-            a(href='/challenges') Challenges
+            a(href='/courseware') Challenges
         li
             a(href='/chat') Chat
         li
@@ -26,6 +26,7 @@
         else
             li
                 if (user.profile.username)
+
                     a(href='/' + user.profile.username) [ #{user.progressTimestamps.length} ]
 
                 else