can download pictures
fixed all the conflicts