merge conflict and add image to docs