better pictures
fixed merge