Merge sidebar

conflict