built sidebar
fixed merge