adding images
fixing merge conflict
fixing merging conflict