change pictures

merge conflicts