add key skills
fix conflict