blurbs added
merging conflicts