upload picture, edit edit page
merge conflicts resolved