deleted conflicted file