changed images
fixed merge errors
fixes