Deleted conflicting files