we are getting photos back from flickr 11111
fixing merge errors