img title changed
merge conflict resolved