Use class state in features.py
Fix merge conflict