Species thumbnails
Fix merge conflicts.