deleted conflicted files