use new capability by default
fix conflict