fixed images
merged