fix sidebar.
merge.