add flickr.com
merge