fixed images
merge