fixes sidebar navigation
fixes merge conflict