PIL to pillow
merge