resolved conflict in SpamFilter.py