fixed conflict
Deleting conflicting affymetrix file