modified sidebar bug
merged conflict