merge conflict resolved. image icon need to be updated