Quick change to photo data view controller to avoid merge conflict