begin get data from masterBlender
merge conflict app/the-blender