navbar-hide
switch branch
merge conflict
Merge branch 'hide-nav'

* hide-nav:
  switch branch
  navbar-hide