merge manage-photos.py from production