Some previously added photos were replaced...

i asked this person to send me his photos, because he said "All rights reserved" after he posted on Facebook. Then a few hours after I added them, they were replaced by a merge-conflict, and then he sent me an angry message on Facebook......