Slideshow on the edit mode for existing images
Fixing merge issues