edit yml
fix conflict