add setting features
fix conflict