Added image, Removed extra entities
Merge conflicts
merge conflicts