style controls
fix conflict