sidebar links
fixing bad merge