stuf things sidebar
merging stuff