fixed conflict in SpamFile.txt