sidebar changes
merge