merge sidebar changes