merge with add_photo and resolve conflicts