updated sidebar
merge conflict fixed