Auto pull new photos
merged conflicts