update features to avoid conflict