conflict resolved

src/menu.pug

@@ -2,7 +2,7 @@ nav#navbar
   sib-router#navbar-router(default-route='members')
     sib-route.menu(name='members')
       div.menu-notification
-        div 0
+        div 1
       div.menu-label Members
       div.menu-icon.icon-people
     sib-route.menu(hidden, name='member', id-prefix=`${sdn}/members/`)
@@ -42,3 +42,17 @@ nav#navbar
           next='group'
         )
     div.divider
+    div.menu-wrapper
+      div.menu
+        div.menu-chevron
+          div.menu-icon.icon-arrow-down
+        div.menu-label Chat
+        div.menu-icon.icon-envelope-letter
+      sib-route(hidden, name='chat', id-prefix=`${sdn}/members/`)
+      div.sub-menu
+        sib-display(
+          data-src=`${sdn}/members/`,
+          data-fields='pseudo',
+          next='chat'
+        )
+    div.divider

src/menu.pug.orig

@@ -0,0 +1,59 @@
+nav#navbar
+  sib-router#navbar-router(default-route='members')
+    sib-route.menu(name='members')
+      div.menu-notification
+        div 0
+      div.menu-label Members
+      div.menu-icon.icon-people
+    sib-route.menu(hidden, name='member', id-prefix=`${sdn}/members/`)
+    div.divider
+    sib-route.menu(name='job-offers')
+      div.menu-notification
+        div 2
+      div.menu-label Job offers
+      div.menu-icon.icon-briefcase
+    sib-route(hidden, name='job-offer-create')
+    div.divider
+    div.menu-wrapper
+      div.menu
+        div.menu-chevron
+          div.menu-icon.icon-arrow-down
+        div.menu-label Projects
+        div.menu-icon.icon-folder-alt
+      sib-route(hidden,name='project', id-prefix=`${sdn}/projects/`)
+      div.sub-menu
+        sib-display(
+          data-src=`${sdn}/projects/`,
+          data-fields='name',
+          next='project'
+        )
+    div.divider
+    div.menu-wrapper
+      div.menu
+        div.menu-chevron
+          div.menu-icon.icon-arrow-down
+        div.menu-label Groups
+        div.menu-icon.icon-globe
+      sib-route(hidden, name='group', id-prefix=`${sdn}/channels/`)
+      div.sub-menu
+        sib-display(
+          data-src=`${sdn}/channels/`,
+          data-fields='name',
+          next='group'
+        )
+<<<<<<< HEAD
+    div.divider
+=======
+    div
+      div.menu
+        div.menu-notification
+        div.menu-label Chat
+        div.menu-icon.icon-envelope-letter
+      sib-route(hidden, name='chat', id-prefix=`${sdn}/members/`)
+      div.sub-menu
+        sib-display(
+          data-src=`${sdn}/members/`,
+          data-fields='pseudo',
+          next='chat'
+        )
+>>>>>>> gm-chat

src/page-project.pug

@@ -1,4 +1,4 @@
-sib-router#project-router(default-route='project-profile')
+sib-router#project-router(default-route='project-chat')
   sib-route(name='project-chat')
     div Chat
   sib-route(name='project-profile')