deleted all but file#1, changed file#1 eXpEct a merge conflicT