fixed merging error from flickr update