Adding blending
Merging conflicts