EmailFeature.py conflict resolved