Make comments to pictures
fixed mergeconflict