screwed up sidebar
fixed merge conflicts