added picture
fixed merge