added image
fixed merge