add link to image fixed
merge conflict