toggleable sidebar
toggleable sidebar
merge conflict