loading image
fixed merge