fix conflicts in single_photo.tpl