Adding image
Fixing merge conflict