re-added image
fixed merge