Deleted conflicted files