add image for merge conflict