navbar update
resolve merge conflicts
resolve merge conflicts