sidebar update
merge