adding sidebar
merging