correct pictures
merge conflict