Fix a bad merge
Fix a bad merge

mozilla-services/pageshot,mozilla-services/screenshots,fzzzy/pageshot,fzzzy/pageshot,mozilla-services/screenshots,fzzzy/pageshot,mozilla-services/screenshots,fzzzy/pageshot,mozilla-services/pageshot,mozilla-services/pageshot,mozilla-services/pageshot,mozilla-services/screenshots