added an image
conflict resolution